diff --git a/forgejo-runner.sh b/forgejo-runner.sh index 228a1bb..dd9de5d 100755 --- a/forgejo-runner.sh +++ b/forgejo-runner.sh @@ -24,7 +24,7 @@ function download() { function register() { local forgejo="$1" docker exec --user 1000 forgejo forgejo actions generate-runner-token > forgejo-runner-token - timeout --signal=KILL 30 forgejo-runner register --no-interactive --instance "$forgejo" --name runner --token $(cat forgejo-runner-token) --labels docker:docker://node:16-bullseye,ubuntu-latest:docker://node:16-buster,self-hosted + timeout --signal=KILL 30 forgejo-runner register --no-interactive --instance "$forgejo" --name runner --token $(cat forgejo-runner-token) --labels docker:docker://code.forgejo.org/oci/node:16-bullseye,ubuntu-latest:docker://code.forgejo.org/oci/node:16-buster,self-hosted } function run() { diff --git a/testdata/example-cron/.forgejo/workflows/test.yml b/testdata/example-cron/.forgejo/workflows/test.yml index e1c2b87..c81b017 100644 --- a/testdata/example-cron/.forgejo/workflows/test.yml +++ b/testdata/example-cron/.forgejo/workflows/test.yml @@ -6,7 +6,7 @@ jobs: test: runs-on: docker container: - image: debian:bookworm + image: code.forgejo.org/oci/debian:bookworm options: "--volume /srv/example-cron-volume:/srv/example-cron-volume" steps: diff --git a/testdata/example-cron/runner-config.yaml b/testdata/example-cron/runner-config.yaml index bc5d862..119cde4 100644 --- a/testdata/example-cron/runner-config.yaml +++ b/testdata/example-cron/runner-config.yaml @@ -10,7 +10,7 @@ runner: insecure: false fetch_timeout: 5s fetch_interval: 2s - labels: [] + labels: ["docker:docker://code.forgejo.org/oci/node:16-bullseye"] cache: enabled: false diff --git a/testdata/example-pull-request/.forgejo/workflows/test.yml b/testdata/example-pull-request/.forgejo/workflows/test.yml index 1e6ad0b..a05f961 100644 --- a/testdata/example-pull-request/.forgejo/workflows/test.yml +++ b/testdata/example-pull-request/.forgejo/workflows/test.yml @@ -9,7 +9,7 @@ jobs: test: runs-on: docker container: - image: debian:bookworm + image: code.forgejo.org/oci/debian:bookworm options: "--volume /srv/example-pull-request:/srv/example-pull-request" steps: diff --git a/testdata/example-pull-request/runner-config.yaml b/testdata/example-pull-request/runner-config.yaml index 7f7d9cc..e9f4aeb 100644 --- a/testdata/example-pull-request/runner-config.yaml +++ b/testdata/example-pull-request/runner-config.yaml @@ -10,7 +10,7 @@ runner: insecure: false fetch_timeout: 5s fetch_interval: 2s - labels: [] + labels: ["docker:docker://code.forgejo.org/oci/node:16-bullseye"] cache: enabled: false diff --git a/testdata/example-service/.forgejo/workflows/postgresql.yml b/testdata/example-service/.forgejo/workflows/postgresql.yml index f600b17..9d9d30e 100644 --- a/testdata/example-service/.forgejo/workflows/postgresql.yml +++ b/testdata/example-service/.forgejo/workflows/postgresql.yml @@ -4,11 +4,11 @@ jobs: test: runs-on: docker container: - image: debian:bookworm + image: code.forgejo.org/oci/debian:bookworm services: pgsql: - image: postgres:15 + image: code.forgejo.org/oci/postgres:15 env: POSTGRES_DB: test POSTGRES_PASSWORD: postgres diff --git a/testdata/example-service/.forgejo/workflows/volume.yml b/testdata/example-service/.forgejo/workflows/volume.yml index e3c240e..0649f50 100644 --- a/testdata/example-service/.forgejo/workflows/volume.yml +++ b/testdata/example-service/.forgejo/workflows/volume.yml @@ -7,7 +7,7 @@ jobs: volume-on-step: runs-on: docker container: - image: debian:bookworm + image: code.forgejo.org/oci/debian:bookworm options: "--volume /srv/example-service-volume-valid:/srv/example-service-volume-valid --volume /srv/example-service-volume-invalid:/srv/example-service-volume-invalid" steps: @@ -21,12 +21,12 @@ jobs: volume-on-service: runs-on: docker container: - image: debian:bookworm + image: code.forgejo.org/oci/debian:bookworm options: "--volume /srv/example-service-volume-valid:/srv/example-service-volume-valid" services: myservice: - image: debian:bookworm + image: code.forgejo.org/oci/debian:bookworm options: "--volume /srv/example-service-volume-valid:/srv/example-service-volume-valid" cmd: ["bash", "-c", "echo -n SUCCESS > /srv/example-service-volume-valid ; sleep infinity"] diff --git a/testdata/example-service/runner-config.yaml b/testdata/example-service/runner-config.yaml index 95ea4cb..4606852 100644 --- a/testdata/example-service/runner-config.yaml +++ b/testdata/example-service/runner-config.yaml @@ -10,7 +10,7 @@ runner: insecure: false fetch_timeout: 5s fetch_interval: 2s - labels: [] + labels: ["docker:docker://code.forgejo.org/oci/node:16-bullseye"] cache: enabled: false