From 1f2cdd36559f5a549fa268e272b2f97934e07a74 Mon Sep 17 00:00:00 2001 From: liuyx Date: Mon, 5 Feb 2024 23:27:08 +0800 Subject: [PATCH] feat(action): update gitea runner --- .env | 11 ++++- .gitignore | 4 +- docker-compose.yaml | 57 ++++++++++++++++++++++++-- git.Dockerfile | 6 +++ gitrun-git/config.yaml | 91 ++++++++++++++++++++++++++++++++++++++++++ gitrun/config.yaml | 91 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 253 insertions(+), 7 deletions(-) create mode 100644 git.Dockerfile create mode 100644 gitrun-git/config.yaml create mode 100644 gitrun/config.yaml diff --git a/.env b/.env index 08c0ec1..27264c7 100644 --- a/.env +++ b/.env @@ -1,10 +1,17 @@ +COMPOSE_PROJECT_NAME=happeny DIR=. +TZ=Asia/Shanghai +TERM=xterm-256color + +# db GITEA__database__DB_TYPE= GITEA__database__HOST= GITEA__database__NAME= GITEA__database__USER= GITEA__database__PASSWD= +# runner +GITEA_INSTANCE_URL=http://gitea:3000 +GITEA_RUNNER_REGISTRATION_TOKEN=RRNq24uq6O7nxZgdEiD2RVNBE0KOo8o7FTIAddkD -TZ=Asia/Shanghai -TERM=xterm-256color \ No newline at end of file +DEST_APP=../app/gitea \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1d38f11..e62471f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ # deploy /data -/gitea \ No newline at end of file +/gitea + +*/data \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index d4e8e71..c89817f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,20 +2,21 @@ version: "3" networks: gitea: - name: gitea + name: local driver: bridge - external: false + external: true services: gitea: - image: gitea/gitea:dev container_name: gitea + image: gitea/gitea:nightly environment: USER_UID: 1000 USER_GID: 1000 TZ: TERM: + GITEA__webhook__ALLOWED_HOST_LIST: "*" restart: always networks: - gitea @@ -24,4 +25,52 @@ services: - /etc/localtime:/etc/localtime:ro ports: - "1080:3000" - - "10022:22" \ No newline at end of file + - "10022:22" + + gitru: + container_name: gitru + image: gitea/act_runner:nightly-dind-rootless + restart: always + privileged: true + depends_on: + - gitea + networks: + - gitea + environment: + TZ: + TERM: + GITEA_INSTANCE_URL: + GITEA_RUNNER_REGISTRATION_TOKEN: + DOCKER_HOST: unix:///run/user/1000/docker.sock + GITEA_RUNNER_NAME: def + # GITEA_RUNNER_LABELS: ubuntu-latest:docker://node:16 + volumes: + - ${DIR:-.}/gitrun/data:/data + - ${DIR:-.}/gitrun/config.yaml:/config.yaml + - /etc/localtime:/etc/localtime:ro + + gitru-git: + container_name: gitru-git + image: gitea/act_runner:git + build: + context: . + dockerfile: git.Dockerfile + restart: always + privileged: true + depends_on: + - gitea + networks: + - gitea + environment: + TZ: + TERM: + GITEA_INSTANCE_URL: + GITEA_RUNNER_REGISTRATION_TOKEN: + DOCKER_HOST: unix:///run/user/1000/docker.sock + GITEA_RUNNER_NAME: def_host + GITEA_RUNNER_LABELS: linux:host, + volumes: + - ${DIR:-.}/gitrun-git/data:/data + - ${DIR:-.}/gitrun-git/config.yaml:/config.yaml + - ${DEST_APP:-.}/git-repo:/app/ + - /etc/localtime:/etc/localtime:ro \ No newline at end of file diff --git a/git.Dockerfile b/git.Dockerfile new file mode 100644 index 0000000..e5ad4d2 --- /dev/null +++ b/git.Dockerfile @@ -0,0 +1,6 @@ +FROM gitea/act_runner:nightly-dind-rootless + +USER root +RUN apk add --no-cache git + +USER rootless \ No newline at end of file diff --git a/gitrun-git/config.yaml b/gitrun-git/config.yaml new file mode 100644 index 0000000..e60dc56 --- /dev/null +++ b/gitrun-git/config.yaml @@ -0,0 +1,91 @@ +# Example configuration file, it's safe to copy this as the default config file without any modification. + +# You don't have to copy this file to your instance, +# just run `./act_runner generate-config > config.yaml` to generate a config file. + +log: + # The level of logging, can be trace, debug, info, warn, error, fatal + level: trace + +runner: + # Where to store the registration result. + file: .runner + # Execute how many tasks concurrently at the same time. + capacity: 1 + # Extra environment variables to run jobs. + envs: + A_TEST_ENV_NAME_1: a_test_env_value_1 + A_TEST_ENV_NAME_2: a_test_env_value_2 + # Extra environment variables to run jobs from a file. + # It will be ignored if it's empty or the file doesn't exist. + env_file: .env + # The timeout for a job to be finished. + # Please note that the Gitea instance also has a timeout (3h by default) for the job. + # So the job could be stopped by the Gitea instance if it's timeout is shorter than this. + timeout: 3h + # Whether skip verifying the TLS certificate of the Gitea instance. + insecure: false + # The timeout for fetching the job from the Gitea instance. + fetch_timeout: 5s + # The interval for fetching the job from the Gitea instance. + fetch_interval: 2s + # The labels of a runner are used to determine which jobs the runner can run, and how to run them. + # Like: ["macos-arm64:host", "ubuntu-latest:docker://node:16-bullseye", "ubuntu-22.04:docker://node:16-bullseye"] + # If it's empty when registering, it will ask for inputting labels. + # If it's empty when execute `deamon`, will use labels in `.runner` file. + labels: [] + +cache: + # Enable cache server to use actions/cache. + enabled: true + # The directory to store the cache data. + # If it's empty, the cache data will be stored in $HOME/.cache/actcache. + dir: "" + # The host of the cache server. + # It's not for the address to listen, but the address to connect from job containers. + # So 0.0.0.0 is a bad choice, leave it empty to detect automatically. + host: "" + # The port of the cache server. + # 0 means to use a random available port. + port: 0 + # The external cache server URL. Valid only when enable is true. + # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself. + # The URL should generally end with "/". + external_server: "" + +container: + # Specifies the network to which the container will connect. + # Could be host, bridge or the name of a custom network. + # If it's empty, act_runner will create a network automatically. + network: "" + # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker). + privileged: false + # And other options to be used when the container is started (eg, --add-host=my.gitea.url:host-gateway). + options: + # The parent directory of a job's working directory. + # If it's empty, /workspace will be used. + workdir_parent: + # Volumes (including bind mounts) can be mounted to containers. Glob syntax is supported, see https://github.com/gobwas/glob + # You can specify multiple volumes. If the sequence is empty, no volumes can be mounted. + # For example, if you only allow containers to mount the `data` volume and all the json files in `/src`, you should change the config to: + # valid_volumes: + # - data + # - /src/*.json + # If you want to allow any volume, please use the following configuration: + # valid_volumes: + # - '**' + valid_volumes: [] + # overrides the docker client host with the specified one. + # If it's empty, act_runner will find an available docker host automatically. + # If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers. + # If it's not empty or "-", the specified docker host will be used. An error will be returned if it doesn't work. + docker_host: "" + # Pull docker image(s) even if already present + force_pull: false + # Rebuild docker image(s) even if already present + force_rebuild: false + +host: + # The parent directory of a job's working directory. + # If it's empty, $HOME/.cache/act/ will be used. + workdir_parent: diff --git a/gitrun/config.yaml b/gitrun/config.yaml new file mode 100644 index 0000000..e60dc56 --- /dev/null +++ b/gitrun/config.yaml @@ -0,0 +1,91 @@ +# Example configuration file, it's safe to copy this as the default config file without any modification. + +# You don't have to copy this file to your instance, +# just run `./act_runner generate-config > config.yaml` to generate a config file. + +log: + # The level of logging, can be trace, debug, info, warn, error, fatal + level: trace + +runner: + # Where to store the registration result. + file: .runner + # Execute how many tasks concurrently at the same time. + capacity: 1 + # Extra environment variables to run jobs. + envs: + A_TEST_ENV_NAME_1: a_test_env_value_1 + A_TEST_ENV_NAME_2: a_test_env_value_2 + # Extra environment variables to run jobs from a file. + # It will be ignored if it's empty or the file doesn't exist. + env_file: .env + # The timeout for a job to be finished. + # Please note that the Gitea instance also has a timeout (3h by default) for the job. + # So the job could be stopped by the Gitea instance if it's timeout is shorter than this. + timeout: 3h + # Whether skip verifying the TLS certificate of the Gitea instance. + insecure: false + # The timeout for fetching the job from the Gitea instance. + fetch_timeout: 5s + # The interval for fetching the job from the Gitea instance. + fetch_interval: 2s + # The labels of a runner are used to determine which jobs the runner can run, and how to run them. + # Like: ["macos-arm64:host", "ubuntu-latest:docker://node:16-bullseye", "ubuntu-22.04:docker://node:16-bullseye"] + # If it's empty when registering, it will ask for inputting labels. + # If it's empty when execute `deamon`, will use labels in `.runner` file. + labels: [] + +cache: + # Enable cache server to use actions/cache. + enabled: true + # The directory to store the cache data. + # If it's empty, the cache data will be stored in $HOME/.cache/actcache. + dir: "" + # The host of the cache server. + # It's not for the address to listen, but the address to connect from job containers. + # So 0.0.0.0 is a bad choice, leave it empty to detect automatically. + host: "" + # The port of the cache server. + # 0 means to use a random available port. + port: 0 + # The external cache server URL. Valid only when enable is true. + # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself. + # The URL should generally end with "/". + external_server: "" + +container: + # Specifies the network to which the container will connect. + # Could be host, bridge or the name of a custom network. + # If it's empty, act_runner will create a network automatically. + network: "" + # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker). + privileged: false + # And other options to be used when the container is started (eg, --add-host=my.gitea.url:host-gateway). + options: + # The parent directory of a job's working directory. + # If it's empty, /workspace will be used. + workdir_parent: + # Volumes (including bind mounts) can be mounted to containers. Glob syntax is supported, see https://github.com/gobwas/glob + # You can specify multiple volumes. If the sequence is empty, no volumes can be mounted. + # For example, if you only allow containers to mount the `data` volume and all the json files in `/src`, you should change the config to: + # valid_volumes: + # - data + # - /src/*.json + # If you want to allow any volume, please use the following configuration: + # valid_volumes: + # - '**' + valid_volumes: [] + # overrides the docker client host with the specified one. + # If it's empty, act_runner will find an available docker host automatically. + # If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers. + # If it's not empty or "-", the specified docker host will be used. An error will be returned if it doesn't work. + docker_host: "" + # Pull docker image(s) even if already present + force_pull: false + # Rebuild docker image(s) even if already present + force_rebuild: false + +host: + # The parent directory of a job's working directory. + # If it's empty, $HOME/.cache/act/ will be used. + workdir_parent: