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

Grzegorz Alibożek committed 4 years ago

Commit 45631481 parent b7c64574 files · +18 −10Browse files

Unified · Split

4 files

Dockerfile +3 −5
Dockerfile.rootless +3 −5
docker/root/usr/bin/entrypoint +6 −0
docker/rootless/usr/local/bin/docker-entrypoint.sh +6 −0

Dockerfile+3−5

@@ -1,7 +1,5 @@
1		1	#Build stage
2	###################################	2	FROM golang:1.17-alpine3.15 AS build-env
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
5		3
6	ARG GOPROXY	4	ARG GOPROXY
7	ENV GOPROXY ${GOPROXY:-direct}	5	ENV GOPROXY ${GOPROXY:-direct}
@@ -25,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ · 17 unmodified lines
25	# Begin env-to-ini build	23	# Begin env-to-ini build
26	RUN go build contrib/environment-to-ini/environment-to-ini.go	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	LABEL maintainer="maintainers@gitea.io"	27	LABEL maintainer="maintainers@gitea.io"
30		28
31	EXPOSE 22 3000	29	EXPOSE 22 3000

Dockerfile.rootless+3−5

@@ -1,7 +1,5 @@
1		1	#Build stage
2	###################################	2	FROM golang:1.17-alpine3.15 AS build-env
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
5		3
6	ARG GOPROXY	4	ARG GOPROXY
7	ENV GOPROXY ${GOPROXY:-direct}	5	ENV GOPROXY ${GOPROXY:-direct}
@@ -25,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ · 17 unmodified lines
25	# Begin env-to-ini build	23	# Begin env-to-ini build
26	RUN go build contrib/environment-to-ini/environment-to-ini.go	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	LABEL maintainer="maintainers@gitea.io"	27	LABEL maintainer="maintainers@gitea.io"
30		28
31	EXPOSE 2222 3000	29	EXPOSE 2222 3000

docker/root/usr/bin/entrypoint+6−0

@@ -1,5 +1,11 @@
1	#!/bin/sh	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	if [ "${USER}" != "git" ]; then	9	if [ "${USER}" != "git" ]; then
4	# rename user	10	# rename user
5	sed -i -e "s/^git\:/${USER}\:/g" /etc/passwd	11	sed -i -e "s/^git\:/${USER}\:/g" /etc/passwd

docker/rootless/usr/local/bin/docker-entrypoint.sh+6−0

@@ -1,5 +1,11 @@
1	#!/bin/sh	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	if [ -x /usr/local/bin/docker-setup.sh ]; then	9	if [ -x /usr/local/bin/docker-setup.sh ]; then
4	/usr/local/bin/docker-setup.sh \|\| { echo 'docker setup failed' ; exit 1; }	10	/usr/local/bin/docker-setup.sh \|\| { echo 'docker setup failed' ; exit 1; }
5	fi	11	fi