Upgrade Alpine from 3.13 to 3.15 (#18050) * 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>

Changes

4 changed files (+18/-10)

• 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
• 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
• 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
• 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