diff options
| author | Grzegorz Alibożek <70749001+galibozek@users.noreply.github.com> | 2022-01-19 22:55:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 16:55:17 -0500 |
| commit | 4563148a61ba892e8f2bb66342f00a950bcd5315 (patch) | |
| tree | 57bc8ecf43e76fbe06e3e1e0f2546deef8492785 /Dockerfile.rootless | |
| parent | b7c64576484d2095e946d847dbd7a751695870f8 (diff) | |
| download | gitea-4563148a61ba892e8f2bb66342f00a950bcd5315.tar.gz gitea-4563148a61ba892e8f2bb66342f00a950bcd5315.zip | |
Upgrade Alpine from 3.13 to 3.15 (#18050)v1.17.0-dev
* Upgrade alpine to 3.15
* Add executability test to entrypoint for too old dockers
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Update docker/rootless/usr/local/bin/docker-entrypoint.sh
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'Dockerfile.rootless')
| -rw-r--r-- | Dockerfile.rootless | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 5b22b26bc2..78a6c3cb03 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,7 +1,5 @@ - -################################### -#Build stage - temporarily using techknowlogick image until we upgrade to latest official alpine/go image -FROM techknowlogick/go:1.17-alpine3.13 AS build-env +#Build stage +FROM golang:1.17-alpine3.15 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -25,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 alpine:3.13 +FROM alpine:3.15 LABEL maintainer="maintainers@gitea.io" EXPOSE 2222 3000 |