From 53ca3d4e6cfa734585165ebf4a8f3af686b43f81 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Mon, 12 Aug 2024 16:11:35 +0200 Subject: [PATCH 1/3] chore(ci): Use mirrored container images for node --- .forgejo/workflows/backport.yml | 2 +- .forgejo/workflows/e2e.yml | 2 +- .forgejo/workflows/mirror.yml | 2 +- .../release-notes-assistant-milestones.yml | 2 +- .forgejo/workflows/release-notes-assistant.yml | 2 +- .forgejo/workflows/testing.yml | 16 ++++++++-------- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.forgejo/workflows/backport.yml b/.forgejo/workflows/backport.yml index 4eb276f76b..32a93edbc0 100644 --- a/.forgejo/workflows/backport.yml +++ b/.forgejo/workflows/backport.yml @@ -38,7 +38,7 @@ jobs: ) runs-on: docker container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - name: event info run: | diff --git a/.forgejo/workflows/e2e.yml b/.forgejo/workflows/e2e.yml index eec82953bc..3cf3d86413 100644 --- a/.forgejo/workflows/e2e.yml +++ b/.forgejo/workflows/e2e.yml @@ -14,7 +14,7 @@ jobs: if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v4 - uses: https://code.forgejo.org/actions/setup-go@v4 diff --git a/.forgejo/workflows/mirror.yml b/.forgejo/workflows/mirror.yml index 7c22918822..fd222115ac 100644 --- a/.forgejo/workflows/mirror.yml +++ b/.forgejo/workflows/mirror.yml @@ -11,7 +11,7 @@ jobs: if: ${{ secrets.MIRROR_TOKEN != '' }} runs-on: docker container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - name: git push {v*/,}forgejo run: | diff --git a/.forgejo/workflows/release-notes-assistant-milestones.yml b/.forgejo/workflows/release-notes-assistant-milestones.yml index 6b1497657b..fb7bba1d52 100644 --- a/.forgejo/workflows/release-notes-assistant-milestones.yml +++ b/.forgejo/workflows/release-notes-assistant-milestones.yml @@ -9,7 +9,7 @@ jobs: if: ${{ !startsWith(vars.ROLE, 'forgejo-') runs-on: docker container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v3 diff --git a/.forgejo/workflows/release-notes-assistant.yml b/.forgejo/workflows/release-notes-assistant.yml index 0dc3f12ee1..dd67b4e203 100644 --- a/.forgejo/workflows/release-notes-assistant.yml +++ b/.forgejo/workflows/release-notes-assistant.yml @@ -10,7 +10,7 @@ jobs: if: ${{ !startsWith(vars.ROLE, 'forgejo-') && contains(github.event.pull_request.labels.*.name, 'worth a release-note') }} runs-on: docker container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v3 diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml index 13d01011e3..c4c3766c08 100644 --- a/.forgejo/workflows/testing.yml +++ b/.forgejo/workflows/testing.yml @@ -12,7 +12,7 @@ jobs: if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - name: event info run: | @@ -29,7 +29,7 @@ jobs: if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v3 - run: make deps-frontend @@ -42,7 +42,7 @@ jobs: runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' services: elasticsearch: image: elasticsearch:7.17.22 @@ -96,7 +96,7 @@ jobs: runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' strategy: matrix: cacher: @@ -151,7 +151,7 @@ jobs: runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' services: mysql: image: 'docker.io/mysql:8-debian' @@ -197,7 +197,7 @@ jobs: runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' services: minio: image: bitnami/minio:2024.3.30 @@ -248,7 +248,7 @@ jobs: runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 @@ -291,7 +291,7 @@ jobs: - test-remote-cacher - test-unit container: - image: 'docker.io/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 From c3f2b60b3bc9c268022ccda3dcd4d460e0cb6e04 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Mon, 12 Aug 2024 16:14:31 +0200 Subject: [PATCH 2/3] chore(renovate): Add mirrored node image to renovate.json --- renovate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/renovate.json b/renovate.json index 9fd2541f0d..175d8a9884 100644 --- a/renovate.json +++ b/renovate.json @@ -105,6 +105,7 @@ "matchDepNames": [ "node", "docker.io/node", + "code.forgejo.org/oci/node", "docker.io/library/node" ], "groupName": "nodejs packages", From 395c10596e2e1c77dcb1e29de42cd2063cfb1672 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Mon, 12 Aug 2024 16:15:53 +0200 Subject: [PATCH 3/3] chore(ci): use postgres image from mirror --- .forgejo/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml index c4c3766c08..b4386071b1 100644 --- a/.forgejo/workflows/testing.yml +++ b/.forgejo/workflows/testing.yml @@ -207,7 +207,7 @@ jobs: ldap: image: docker.io/gitea/test-openldap:latest pgsql: - image: 'docker.io/postgres:15' + image: 'code.forgejo.org/oci/postgres:15' env: POSTGRES_DB: test POSTGRES_PASSWORD: postgres