diff options
| author | Grzegorz Alibożek | 2022-01-19 22:55:17 +0100 |
|---|---|---|
| committer | GitHub | 2022-01-19 16:55:17 -0500 |
| commit | 4563148a61ba892e8f2bb66342f00a950bcd5315 (patch) | |
| tree | 57bc8ecf43e76fbe06e3e1e0f2546deef8492785 | |
| parent | b7c64576484d2095e946d847dbd7a751695870f8 (diff) | |
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>
| -rw-r--r-- | Dockerfile | 8 | ||||
| -rw-r--r-- | Dockerfile.rootless | 8 | ||||
| -rwxr-xr-x | docker/root/usr/bin/entrypoint | 6 | ||||
| -rwxr-xr-x | docker/rootless/usr/local/bin/docker-entrypoint.sh | 6 |
4 files changed, 18 insertions, 10 deletions
diff --git a/Dockerfile b/Dockerfile index e9767402c..8cb88ae83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 22 3000 diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 5b22b26bc..78a6c3cb0 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 diff --git a/docker/root/usr/bin/entrypoint b/docker/root/usr/bin/entrypoint index a3c03ecff..0acfec4db 100755 --- a/docker/root/usr/bin/entrypoint +++ b/docker/root/usr/bin/entrypoint @@ -1,5 +1,11 @@ #!/bin/sh +# Protect against buggy runc in docker <20.10.6 causing problems in with Alpine >= 3.14 +if [ ! -x /bin/sh ]; then + echo "Executable test for /bin/sh failed. Your Docker version is too old to run Alpine 3.14+ and Gitea. You must upgrade Docker."; + exit 1; +fi + if [ "${USER}" != "git" ]; then # rename user sed -i -e "s/^git\:/${USER}\:/g" /etc/passwd diff --git a/docker/rootless/usr/local/bin/docker-entrypoint.sh b/docker/rootless/usr/local/bin/docker-entrypoint.sh index d05777adc..ca509214b 100755 --- a/docker/rootless/usr/local/bin/docker-entrypoint.sh +++ b/docker/rootless/usr/local/bin/docker-entrypoint.sh @@ -1,5 +1,11 @@ #!/bin/sh +# Protect against buggy runc in docker <20.10.6 causing problems in with Alpine >= 3.14 +if [ ! -x /bin/sh ]; then + echo "Executable test for /bin/sh failed. Your Docker version is too old to run Alpine 3.14+ and Gitea. You must upgrade Docker."; + exit 1; +fi + if [ -x /usr/local/bin/docker-setup.sh ]; then /usr/local/bin/docker-setup.sh || { echo 'docker setup failed' ; exit 1; } fi |