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

Showing the changes to docker (2 of 4 files). Show all

Unified · Split

2 files

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

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