diff options
| author | Yevhen Pavlov <sonjekua@gmail.com> | 2023-05-14 04:49:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-14 01:49:00 +0000 |
| commit | bed688544825cd7384783b262ba9a80772730796 (patch) | |
| tree | 375aa34fa6aff5d898f06d0c9ce612a7d884c267 | |
| parent | 61ad4c607b09f102151298af98757dbae2c2fa88 (diff) | |
| download | gitea-bed688544825cd7384783b262ba9a80772730796.tar.gz gitea-bed688544825cd7384783b262ba9a80772730796.zip | |
Update to Alpine 3.18 (#24700)
This pull request is for updating the base docker images to build with the latest version of Alpine.
| -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 3623085e47..06481cdf5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ #Build stage -FROM docker.io/library/golang:1.20-alpine3.17 AS build-env +FROM docker.io/library/golang:1.20-alpine3.18 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ # Begin env-to-ini build RUN go build contrib/environment-to-ini/environment-to-ini.go -FROM docker.io/library/alpine:3.17 +FROM docker.io/library/alpine:3.18 LABEL maintainer="maintainers@gitea.io" EXPOSE 22 3000 diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 67bd9c4880..aa74d35987 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,5 +1,5 @@ #Build stage -FROM docker.io/library/golang:1.20-alpine3.17 AS build-env +FROM docker.io/library/golang:1.20-alpine3.18 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ # Begin env-to-ini build RUN go build contrib/environment-to-ini/environment-to-ini.go -FROM docker.io/library/alpine:3.17 +FROM docker.io/library/alpine:3.18 LABEL maintainer="maintainers@gitea.io" EXPOSE 2222 3000 |