From 79f6c546752ee2cbc3c08108ba9461975ebc91a0 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sat, 2 Aug 2025 21:55:57 +0000 Subject: [PATCH] chore: replace docker hub with code.forgejo.org (#799) - other - [PR](https://code.forgejo.org/forgejo/runner/pulls/799): chore: replace docker hub with code.forgejo.org Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/799 Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- act/runner/runner_test.go | 2 +- act/runner/testdata/docker-action-custom-path/push.yml | 8 +++----- act/runner/testdata/fail/push.yml | 2 +- act/runner/testdata/issue-104/main.yaml | 2 +- .../testdata/job-container-invalid-credentials/push.yml | 2 +- act/runner/testdata/job-container/push.yml | 4 ++-- .../action/action.yml | 2 +- act/runner/testdata/localdockerimagetest_/Dockerfile | 2 +- act/runner/testdata/parallel/push.yml | 2 +- act/runner/testdata/remote-action-docker/push.yml | 2 +- act/runner/testdata/remote-action-js-node-user/push.yml | 2 +- 11 files changed, 14 insertions(+), 16 deletions(-) diff --git a/act/runner/runner_test.go b/act/runner/runner_test.go index 9ecb4ff8..34045bd0 100644 --- a/act/runner/runner_test.go +++ b/act/runner/runner_test.go @@ -539,7 +539,7 @@ func TestRunner_RunWithService(t *testing.T) { ctx := context.Background() platforms := map[string]string{ - "ubuntu-latest": "node:12.20.1-buster-slim", + "ubuntu-latest": "code.forgejo.org/oci/node:22", } workflowPath := "services" diff --git a/act/runner/testdata/docker-action-custom-path/push.yml b/act/runner/testdata/docker-action-custom-path/push.yml index 37bbf417..fbe8e45e 100644 --- a/act/runner/testdata/docker-action-custom-path/push.yml +++ b/act/runner/testdata/docker-action-custom-path/push.yml @@ -4,9 +4,7 @@ jobs: runs-on: ubuntu-latest steps: - run: | - FROM ubuntu:latest - ENV PATH="/opt/texlive/texdir/bin/x86_64-linuxmusl:${PATH}" - ENV ORG_PATH="${PATH}" - ENTRYPOINT [ "bash", "-c", "echo \"PATH=$PATH\" && echo \"ORG_PATH=$ORG_PATH\" && [[ \"$PATH\" = \"$ORG_PATH\" ]]" ] + FROM code.forgejo.org/oci/alpine:latest + ENTRYPOINT [ "sh", "-c", "echo OK" ] shell: mv {0} Dockerfile - - uses: ./ \ No newline at end of file + - uses: ./ diff --git a/act/runner/testdata/fail/push.yml b/act/runner/testdata/fail/push.yml index fb425302..17a7203c 100644 --- a/act/runner/testdata/fail/push.yml +++ b/act/runner/testdata/fail/push.yml @@ -5,7 +5,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: node:16-buster-slim + image: code.forgejo.org/oci/node:22 env: TEST_ENV: test-value steps: diff --git a/act/runner/testdata/issue-104/main.yaml b/act/runner/testdata/issue-104/main.yaml index 8b158373..38c3456a 100644 --- a/act/runner/testdata/issue-104/main.yaml +++ b/act/runner/testdata/issue-104/main.yaml @@ -10,6 +10,6 @@ jobs: steps: - name: hello - uses: https://code.forgejo.org/forgejo/hello-world-docker-action@v1 + uses: https://code.forgejo.org/forgejo/hello-world-docker-action@v3 with: who-to-greet: "World" diff --git a/act/runner/testdata/job-container-invalid-credentials/push.yml b/act/runner/testdata/job-container-invalid-credentials/push.yml index 79c397ed..1834c55c 100644 --- a/act/runner/testdata/job-container-invalid-credentials/push.yml +++ b/act/runner/testdata/job-container-invalid-credentials/push.yml @@ -5,7 +5,7 @@ jobs: fail-on-invalid-credentials: runs-on: ubuntu-latest container: - image: node:16-buster-slim + image: code.forgejo.org/oci/node:22 credentials: username: "user" password: "" # Empty password caused a crash in jobexecutor diff --git a/act/runner/testdata/job-container/push.yml b/act/runner/testdata/job-container/push.yml index 4033081b..0afb6f33 100644 --- a/act/runner/testdata/job-container/push.yml +++ b/act/runner/testdata/job-container/push.yml @@ -5,7 +5,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: node:16-buster-slim + image: code.forgejo.org/oci/node:22 env: TEST_ENV: test-value steps: @@ -13,7 +13,7 @@ jobs: test2: runs-on: ubuntu-latest - container: node:16-buster-slim + container: code.forgejo.org/oci/node:22 steps: - run: echo ${TEST_ENV} | grep test-value env: diff --git a/act/runner/testdata/local-action-via-composite-dockerfile/action/action.yml b/act/runner/testdata/local-action-via-composite-dockerfile/action/action.yml index 0f92273b..5af779eb 100644 --- a/act/runner/testdata/local-action-via-composite-dockerfile/action/action.yml +++ b/act/runner/testdata/local-action-via-composite-dockerfile/action/action.yml @@ -32,7 +32,7 @@ runs: shell: bash - uses: ./localdockerimagetest_ # Also test a remote docker action here - - uses: https://code.forgejo.org/forgejo/hello-world-docker-action@v1 + - uses: https://code.forgejo.org/forgejo/hello-world-docker-action@v3 with: who-to-greet: 'Mona the Octocat' # Test if GITHUB_ACTION_PATH is set correctly after all steps diff --git a/act/runner/testdata/localdockerimagetest_/Dockerfile b/act/runner/testdata/localdockerimagetest_/Dockerfile index 94798c1d..89ae9d3e 100644 --- a/act/runner/testdata/localdockerimagetest_/Dockerfile +++ b/act/runner/testdata/localdockerimagetest_/Dockerfile @@ -1,2 +1,2 @@ -FROM ubuntu:latest +FROM code.forgejo.org/oci/alpine:latest CMD echo Hello diff --git a/act/runner/testdata/parallel/push.yml b/act/runner/testdata/parallel/push.yml index a2de0a9d..1af9165e 100644 --- a/act/runner/testdata/parallel/push.yml +++ b/act/runner/testdata/parallel/push.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest needs: [build] steps: - - uses: docker://node:16-buster-slim + - uses: docker://code.forgejo.org/oci/node:22 with: args: echo ${GITHUB_REF} | grep nektos/act - uses: ./actions/docker-url diff --git a/act/runner/testdata/remote-action-docker/push.yml b/act/runner/testdata/remote-action-docker/push.yml index 752ef035..8fb1149c 100644 --- a/act/runner/testdata/remote-action-docker/push.yml +++ b/act/runner/testdata/remote-action-docker/push.yml @@ -5,6 +5,6 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: https://code.forgejo.org/forgejo/hello-world-docker-action@v1 + - uses: https://code.forgejo.org/forgejo/hello-world-docker-action@v3 with: who-to-greet: 'Mona the Octocat' diff --git a/act/runner/testdata/remote-action-js-node-user/push.yml b/act/runner/testdata/remote-action-js-node-user/push.yml index 40d01091..cb8e536b 100644 --- a/act/runner/testdata/remote-action-js-node-user/push.yml +++ b/act/runner/testdata/remote-action-js-node-user/push.yml @@ -5,7 +5,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: node:16-buster-slim + image: code.forgejo.org/oci/node:22 options: --user node steps: - name: check permissions of env files