chore: consistent docker image and action references (#6703)

- replace `code.forgejo.org` ->`data.forgejo.org` on docker images
- add `https://data.forgejo.org/` to actions where missing

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6703
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
Co-committed-by: Michael Kriese <michael.kriese@visualon.de>
This commit is contained in:
Michael Kriese 2025-01-28 15:41:11 +00:00 committed by Michael Kriese
parent 5255fd1a6c
commit ff3f12a350
10 changed files with 16 additions and 15 deletions

View file

@ -3,7 +3,7 @@ runs:
steps: steps:
- run: | - run: |
su forgejo -c 'make deps-backend' su forgejo -c 'make deps-backend'
- uses: actions/cache@v4 - uses: https://data.forgejo.org/actions/cache@v4
id: cache-backend id: cache-backend
with: with:
path: ${{github.workspace}}/gitea path: ${{github.workspace}}/gitea

View file

@ -49,7 +49,7 @@ runs:
- name: "Restore Go dependencies from cache or mark for later caching" - name: "Restore Go dependencies from cache or mark for later caching"
id: cache-deps id: cache-deps
uses: actions/cache@v4 uses: https://data.forgejo.org/actions/cache@v4
with: with:
key: setup-cache-go-deps-${{ runner.os }}-${{ inputs.username }}-${{ steps.go-version.outputs.go_version }}-${{ hashFiles('go.sum', 'go.mod') }} key: setup-cache-go-deps-${{ runner.os }}-${{ inputs.username }}-${{ steps.go-version.outputs.go_version }}-${{ hashFiles('go.sum', 'go.mod') }}
restore-keys: | restore-keys: |

View file

@ -25,7 +25,7 @@ jobs:
if: vars.ROLE == 'forgejo-coding' if: vars.ROLE == 'forgejo-coding'
runs-on: lxc-bookworm runs-on: lxc-bookworm
steps: steps:
- uses: actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
- id: forgejo - id: forgejo
uses: https://data.forgejo.org/actions/setup-forgejo@v2.0.4 uses: https://data.forgejo.org/actions/setup-forgejo@v2.0.4

View file

@ -33,7 +33,7 @@ jobs:
# root is used for testing, allow it # root is used for testing, allow it
if: vars.ROLE == 'forgejo-integration' || github.repository_owner == 'root' if: vars.ROLE == 'forgejo-integration' || github.repository_owner == 'root'
steps: steps:
- uses: actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0

View file

@ -37,11 +37,11 @@ jobs:
container: container:
image: data.forgejo.org/oci/node:20-bookworm image: data.forgejo.org/oci/node:20-bookworm
steps: steps:
- uses: actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
with: with:
fetch-depth: '0' fetch-depth: '0'
show-progress: 'false' show-progress: 'false'
- uses: https://code.forgejo.org/actions/cascading-pr@v2.2.0 - uses: https://data.forgejo.org/actions/cascading-pr@v2.2.0
with: with:
origin-url: ${{ env.GITHUB_SERVER_URL }} origin-url: ${{ env.GITHUB_SERVER_URL }}
origin-repo: ${{ github.repository }} origin-repo: ${{ github.repository }}

View file

@ -39,7 +39,7 @@ jobs:
runs-on: lxc-bookworm runs-on: lxc-bookworm
if: vars.DOER != '' && vars.FORGEJO != '' && vars.TO_OWNER != '' && vars.FROM_OWNER != '' && secrets.TOKEN != '' if: vars.DOER != '' && vars.FORGEJO != '' && vars.TO_OWNER != '' && vars.FROM_OWNER != '' && secrets.TOKEN != ''
steps: steps:
- uses: actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
- name: copy & sign - name: copy & sign
uses: https://data.forgejo.org/forgejo/forgejo-build-publish/publish@v5.3.1 uses: https://data.forgejo.org/forgejo/forgejo-build-publish/publish@v5.3.1

View file

@ -46,7 +46,7 @@ jobs:
apt-get update -qq apt-get update -qq
apt-get -q install -qq -y zstd apt-get -q install -qq -y zstd
- name: "Cache frontend build for playwright testing" - name: "Cache frontend build for playwright testing"
uses: actions/cache/save@v4 uses: https://data.forgejo.org/actions/cache/save@v4
with: with:
path: ${{github.workspace}}/public/assets path: ${{github.workspace}}/public/assets
key: frontend-build-${{ github.sha }} key: frontend-build-${{ github.sha }}
@ -104,7 +104,7 @@ jobs:
fetch-depth: 20 fetch-depth: 20
- uses: ./.forgejo/workflows-composite/setup-env - uses: ./.forgejo/workflows-composite/setup-env
- name: "Restore frontend build" - name: "Restore frontend build"
uses: actions/cache/restore@v4 uses: https://data.forgejo.org/actions/cache/restore@v4
id: cache-frontend id: cache-frontend
with: with:
path: ${{github.workspace}}/public/assets path: ${{github.workspace}}/public/assets

View file

@ -1,6 +1,6 @@
FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/xx AS xx FROM --platform=$BUILDPLATFORM data.forgejo.org/oci/xx AS xx
FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/golang:1.23-alpine3.21 as build-env FROM --platform=$BUILDPLATFORM data.forgejo.org/oci/golang:1.23-alpine3.21 as build-env
ARG GOPROXY ARG GOPROXY
ENV GOPROXY=${GOPROXY:-direct} ENV GOPROXY=${GOPROXY:-direct}
@ -51,7 +51,7 @@ RUN chmod 755 /tmp/local/usr/bin/entrypoint \
/go/src/code.gitea.io/gitea/environment-to-ini /go/src/code.gitea.io/gitea/environment-to-ini
RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete
FROM code.forgejo.org/oci/alpine:3.21 FROM data.forgejo.org/oci/alpine:3.21
ARG RELEASE_VERSION ARG RELEASE_VERSION
LABEL maintainer="contact@forgejo.org" \ LABEL maintainer="contact@forgejo.org" \
org.opencontainers.image.authors="Forgejo" \ org.opencontainers.image.authors="Forgejo" \

View file

@ -1,6 +1,6 @@
FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/xx AS xx FROM --platform=$BUILDPLATFORM data.forgejo.org/oci/xx AS xx
FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/golang:1.23-alpine3.21 as build-env FROM --platform=$BUILDPLATFORM data.forgejo.org/oci/golang:1.23-alpine3.21 as build-env
ARG GOPROXY ARG GOPROXY
ENV GOPROXY=${GOPROXY:-direct} ENV GOPROXY=${GOPROXY:-direct}
@ -49,7 +49,7 @@ RUN chmod 755 /tmp/local/usr/local/bin/docker-entrypoint.sh \
/go/src/code.gitea.io/gitea/environment-to-ini /go/src/code.gitea.io/gitea/environment-to-ini
RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete
FROM code.forgejo.org/oci/alpine:3.21 FROM data.forgejo.org/oci/alpine:3.21
LABEL maintainer="contact@forgejo.org" \ LABEL maintainer="contact@forgejo.org" \
org.opencontainers.image.authors="Forgejo" \ org.opencontainers.image.authors="Forgejo" \
org.opencontainers.image.url="https://forgejo.org" \ org.opencontainers.image.url="https://forgejo.org" \

View file

@ -62,6 +62,7 @@
"description": "Group nodejs packages", "description": "Group nodejs packages",
"matchPackageNames": [ "matchPackageNames": [
"code.forgejo.org/oci/node", "code.forgejo.org/oci/node",
"data.forgejo.org/oci/node",
"docker.io/library/node", "docker.io/library/node",
"docker.io/node", "docker.io/node",
"node" "node"