* 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
Unified · Split
| @@ -1,7 +1,5 @@ | ||
| 1 | − | |
| 2 | −################################### | |
| 3 | −#Build stage - temporarily using techknowlogick image until we upgrade to latest official alpine/go image | |
| 4 | −FROM techknowlogick/go:1.17-alpine3.13 AS build-env | |
| 1 | +#Build stage | |
| 2 | +FROM golang:1.17-alpine3.15 AS build-env | |
| 5 | 3 | |
| 6 | 4 | ARG GOPROXY |
| 7 | 5 | ENV GOPROXY ${GOPROXY:-direct} |
| @@ -25,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ · 17 unmodified lines | ||
| 25 | 23 | # Begin env-to-ini build |
| 26 | 24 | RUN go build contrib/environment-to-ini/environment-to-ini.go |
| 27 | 25 | |
| 28 | −FROM alpine:3.13 | |
| 26 | +FROM alpine:3.15 | |
| 29 | 27 | LABEL maintainer="maintainers@gitea.io" |
| 30 | 28 | |
| 31 | 29 | EXPOSE 22 3000 |
| @@ -1,7 +1,5 @@ | ||
| 1 | − | |
| 2 | −################################### | |
| 3 | −#Build stage - temporarily using techknowlogick image until we upgrade to latest official alpine/go image | |
| 4 | −FROM techknowlogick/go:1.17-alpine3.13 AS build-env | |
| 1 | +#Build stage | |
| 2 | +FROM golang:1.17-alpine3.15 AS build-env | |
| 5 | 3 | |
| 6 | 4 | ARG GOPROXY |
| 7 | 5 | ENV GOPROXY ${GOPROXY:-direct} |
| @@ -25,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ · 17 unmodified lines | ||
| 25 | 23 | # Begin env-to-ini build |
| 26 | 24 | RUN go build contrib/environment-to-ini/environment-to-ini.go |
| 27 | 25 | |
| 28 | −FROM alpine:3.13 | |
| 26 | +FROM alpine:3.15 | |
| 29 | 27 | LABEL maintainer="maintainers@gitea.io" |
| 30 | 28 | |
| 31 | 29 | EXPOSE 2222 3000 |
| @@ -1,5 +1,11 @@ | ||
| 1 | 1 | #!/bin/sh |
| 2 | 2 | |
| 3 | +# Protect against buggy runc in docker <20.10.6 causing problems in with Alpine >= 3.14 | |
| 4 | +if [ ! -x /bin/sh ]; then | |
| 5 | + echo "Executable test for /bin/sh failed. Your Docker version is too old to run Alpine 3.14+ and Gitea. You must upgrade Docker."; | |
| 6 | + exit 1; | |
| 7 | +fi | |
| 8 | + | |
| 3 | 9 | if [ "${USER}" != "git" ]; then |
| 4 | 10 | # rename user |
| 5 | 11 | sed -i -e "s/^git\:/${USER}\:/g" /etc/passwd |
| @@ -1,5 +1,11 @@ | ||
| 1 | 1 | #!/bin/sh |
| 2 | 2 | |
| 3 | +# Protect against buggy runc in docker <20.10.6 causing problems in with Alpine >= 3.14 | |
| 4 | +if [ ! -x /bin/sh ]; then | |
| 5 | + echo "Executable test for /bin/sh failed. Your Docker version is too old to run Alpine 3.14+ and Gitea. You must upgrade Docker."; | |
| 6 | + exit 1; | |
| 7 | +fi | |
| 8 | + | |
| 3 | 9 | if [ -x /usr/local/bin/docker-setup.sh ]; then |
| 4 | 10 | /usr/local/bin/docker-setup.sh || { echo 'docker setup failed' ; exit 1; } |
| 5 | 11 | fi |