diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 829d009..8c2534f 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -8,4 +8,4 @@ jobs: steps: - name: Clone repository run: git clone ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git src - - run: ls -alh /var/run/secrets/kubernetes.io/serviceaccount + - run: ls -alh /testje diff --git a/kubenix-modules/forgejo/config.nix b/kubenix-modules/forgejo/config.nix index 9c77bd5..9ca82e8 100644 --- a/kubenix-modules/forgejo/config.nix +++ b/kubenix-modules/forgejo/config.nix @@ -7,7 +7,7 @@ "repository.pull-request".DEFAULT_MERGE_STYLE = "merge"; "repository.signing".DEFAULT_TRUST_MODEL = "committer"; ui.DEFAULT_THEME = "forgejo-light"; - oauth2.ENABLE = false; + oauth2.ENABLED = false; DEFAULT = { APP_NAME = "Forgejo: Beyond coding. We forge."; diff --git a/kubenix-modules/forgejo/default.nix b/kubenix-modules/forgejo/default.nix index 45469ea..8357bdc 100644 --- a/kubenix-modules/forgejo/default.nix +++ b/kubenix-modules/forgejo/default.nix @@ -3,7 +3,10 @@ secrets.runner-secret.stringData.token = "ref+sops://secrets/sops.yaml#/forgejo/runnerToken"; configMaps = { - forgejo-config.data.config = lib.generators.toINI { } (import ./config.nix); + forgejo-config.data = { + config = lib.generators.toINI { } (import ./config.nix); + runner-config = lib.generators.toYAML { } (import ./runner-config.nix); + }; forgejo-env.data = { USER_UID = "1000"; @@ -84,6 +87,7 @@ spec = { restartPolicy = "Always"; + serviceAccountName = "forgejo-runner"; initContainers.runner-register = { image = "code.forgejo.org/forgejo/runner:3.2.0"; @@ -103,16 +107,23 @@ memory = "64Mi"; }; - volumeMounts = [{ - name = "data"; - mountPath = "/data"; - }]; + volumeMounts = [ + { + name = "data"; + mountPath = "/data"; + } + { + name = "config"; + mountPath = "/etc/runner-config.yaml"; + subPath = "runner-config"; + } + ]; }; containers = { runner = { image = "code.forgejo.org/forgejo/runner:3.0.0"; - command = [ "sh" "-c" "while ! nc -z localhost 2376 config.yaml` to generate a config file. + +log: + # The level of logging, can be trace, debug, info, warn, error, fatal + level: info + +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 Forgejo instance also has a timeout (3h by default) for the job. + # So the job could be stopped by the Forgejo instance if it's timeout is shorter than this. + timeout: 3h + # Whether skip verifying the TLS certificate of the Forgejo instance. + insecure: false + # The timeout for fetching the job from the Forgejo instance. + fetch_timeout: 5s + # The interval for fetching the job from the Forgejo 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, 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.forgejo.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 + +host: + # The parent directory of a job's working directory. + # If it's empty, $HOME/.cache/act/ will be used. + workdir_parent: