diff options
| author | Earl Warren <contact@earl-warren.org> | 2024-06-04 23:50:47 +0200 |
|---|---|---|
| committer | Earl Warren <contact@earl-warren.org> | 2024-06-04 23:50:47 +0200 |
| commit | d71afb71da9135fdbef692f2be90b0e16e60e353 (patch) | |
| tree | 09ab5d5694b9d4950d5942d40405ad7f42406b40 | |
| parent | Merge pull request '[gitea] week 2024-23 cherry pick (gitea/main -> forgejo)'... (diff) | |
| download | forgejo-d71afb71da9135fdbef692f2be90b0e16e60e353.tar.xz forgejo-d71afb71da9135fdbef692f2be90b0e16e60e353.zip | |
feat(release): upgrade to golang:1.22-alpine3.20
This reverts commit d59ed64345a5c5472aff6ef80c8b188b1ede33dc.
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | Dockerfile.rootless | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile index 73f8baed9a..c5b472cbb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM --platform=$BUILDPLATFORM docker.io/tonistiigi/xx AS xx -FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/golang:1.22-alpine3.19 as build-env +FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/golang:1.22-alpine3.20 as build-env ARG GOPROXY 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 RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete -FROM code.forgejo.org/oci/golang:1.22-alpine3.19 +FROM code.forgejo.org/oci/golang:1.22-alpine3.20 ARG RELEASE_VERSION LABEL maintainer="contact@forgejo.org" \ org.opencontainers.image.authors="Forgejo" \ diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 91a83c9fa2..484711a932 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,6 +1,6 @@ FROM --platform=$BUILDPLATFORM docker.io/tonistiigi/xx AS xx -FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/golang:1.22-alpine3.19 as build-env +FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/golang:1.22-alpine3.20 as build-env ARG GOPROXY 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 RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete -FROM code.forgejo.org/oci/golang:1.22-alpine3.19 +FROM code.forgejo.org/oci/golang:1.22-alpine3.20 LABEL maintainer="contact@forgejo.org" \ org.opencontainers.image.authors="Forgejo" \ org.opencontainers.image.url="https://forgejo.org" \ |