From 8ec0fe3a4d9bf9243a2b3247927169c139d5a1a1 Mon Sep 17 00:00:00 2001
From: Joe Ferguson <joe@infosiftr.com>
Date: Fri, 15 Jan 2021 16:52:20 -0800
Subject: [PATCH] Add alpine:3.13 images; Drop alpine:3.11

Only two versions of alpine are supported at a time
---
 2.5/{alpine3.11 => alpine3.13}/Dockerfile |   2 +-
 2.6/{alpine3.11 => alpine3.13}/Dockerfile |   2 +-
 2.7/{alpine3.11 => alpine3.13}/Dockerfile |   2 +-
 3.0/alpine3.13/Dockerfile                 | 130 ++++++++++++++++++++++
 generate-stackbrew-library.sh             |   4 +-
 update.sh                                 |   2 +-
 6 files changed, 136 insertions(+), 6 deletions(-)
 rename 2.5/{alpine3.11 => alpine3.13}/Dockerfile (99%)
 rename 2.6/{alpine3.11 => alpine3.13}/Dockerfile (99%)
 rename 2.7/{alpine3.11 => alpine3.13}/Dockerfile (99%)
 create mode 100644 3.0/alpine3.13/Dockerfile

diff --git a/2.5/alpine3.11/Dockerfile b/2.5/alpine3.13/Dockerfile
similarity index 99%
rename from 2.5/alpine3.11/Dockerfile
rename to 2.5/alpine3.13/Dockerfile
index ead925c04..e6b003f46 100644
--- a/2.5/alpine3.11/Dockerfile
+++ b/2.5/alpine3.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.13
 
 RUN apk add --no-cache \
 		gmp-dev
diff --git a/2.6/alpine3.11/Dockerfile b/2.6/alpine3.13/Dockerfile
similarity index 99%
rename from 2.6/alpine3.11/Dockerfile
rename to 2.6/alpine3.13/Dockerfile
index b0aa8d860..85186cf3b 100644
--- a/2.6/alpine3.11/Dockerfile
+++ b/2.6/alpine3.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.13
 
 RUN apk add --no-cache \
 		gmp-dev
diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.13/Dockerfile
similarity index 99%
rename from 2.7/alpine3.11/Dockerfile
rename to 2.7/alpine3.13/Dockerfile
index 2ba5bfc8e..f1600e8a2 100644
--- a/2.7/alpine3.11/Dockerfile
+++ b/2.7/alpine3.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.13
 
 RUN apk add --no-cache \
 		gmp-dev
diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.13/Dockerfile
new file mode 100644
index 000000000..77dabff95
--- /dev/null
+++ b/3.0/alpine3.13/Dockerfile
@@ -0,0 +1,130 @@
+FROM alpine:3.13
+
+RUN apk add --no-cache \
+		gmp-dev
+
+# skip installing gem documentation
+RUN set -eux; \
+	mkdir -p /usr/local/etc; \
+	{ \
+		echo 'install: --no-document'; \
+		echo 'update: --no-document'; \
+	} >> /usr/local/etc/gemrc
+
+ENV LANG C.UTF-8
+ENV RUBY_MAJOR 3.0
+ENV RUBY_VERSION 3.0.0
+ENV RUBY_DOWNLOAD_SHA256 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1
+
+# some of ruby's build scripts are written in ruby
+#   we purge system ruby later to make sure our final image uses what we just built
+# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75
+RUN set -eux; \
+	\
+	apk add --no-cache --virtual .ruby-builddeps \
+		autoconf \
+		bison \
+		bzip2 \
+		bzip2-dev \
+		ca-certificates \
+		coreutils \
+		dpkg-dev dpkg \
+		gcc \
+		gdbm-dev \
+		glib-dev \
+		libc-dev \
+		libffi-dev \
+		libxml2-dev \
+		libxslt-dev \
+		linux-headers \
+		make \
+		ncurses-dev \
+		openssl \
+		openssl-dev \
+		patch \
+		procps \
+		readline-dev \
+		ruby \
+		tar \
+		xz \
+		yaml-dev \
+		zlib-dev \
+	; \
+	\
+	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
+	\
+	mkdir -p /usr/src/ruby; \
+	tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \
+	rm ruby.tar.xz; \
+	\
+	cd /usr/src/ruby; \
+	\
+# https://github.com/docker-library/ruby/issues/196
+# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
+# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here)
+	wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \
+	echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \
+	patch -p1 -i thread-stack-fix.patch; \
+	rm thread-stack-fix.patch; \
+	\
+# hack in "ENABLE_PATH_CHECK" disabling to suppress:
+#   warning: Insecure world writable dir
+	{ \
+		echo '#define ENABLE_PATH_CHECK 0'; \
+		echo; \
+		cat file.c; \
+	} > file.c.new; \
+	mv file.c.new file.c; \
+	\
+	autoconf; \
+	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+# the configure script does not detect isnan/isinf as macros
+	export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \
+	./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	; \
+	make -j "$(nproc)"; \
+	make install; \
+	\
+	runDeps="$( \
+		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
+			| tr ',' '\n' \
+			| sort -u \
+			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+	)"; \
+	apk add --no-network --virtual .ruby-rundeps \
+		$runDeps \
+		bzip2 \
+		ca-certificates \
+		libffi-dev \
+		procps \
+		yaml-dev \
+		zlib-dev \
+	; \
+	apk del --no-network .ruby-builddeps; \
+	\
+	cd /; \
+	rm -r /usr/src/ruby; \
+# verify we have no "ruby" packages installed
+	! apk --no-network list --installed \
+		| grep -v '^[.]ruby-rundeps' \
+		| grep -i ruby \
+	; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
+# rough smoke test
+	ruby --version; \
+	gem --version; \
+	bundle --version
+
+# don't create ".bundle" in all our apps
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $GEM_HOME/bin:$PATH
+# adjust permissions of a few directories for running "gem install" as an arbitrary user
+RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
+
+CMD [ "irb" ]
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index c179d37a2..3067c4395 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -10,7 +10,7 @@ defaultDebianSuite='buster'
 declare -A debianSuites=(
 	#[2.7]='buster'
 )
-defaultAlpineVersion='3.12'
+defaultAlpineVersion='3.13'
 declare -A alpineVersion=(
 	#[2.3]='3.8'
 )
@@ -80,7 +80,7 @@ join() {
 for version in "${versions[@]}"; do
 	for v in \
 		{buster,stretch}{,/slim} \
-		alpine{3.12,3.11} \
+		alpine{3.13,3.12} \
 	; do
 		dir="$version/$v"
 		variant="$(basename "$v")"
diff --git a/update.sh b/update.sh
index 42181d906..f34bdc8fa 100755
--- a/update.sh
+++ b/update.sh
@@ -58,7 +58,7 @@ for version in "${versions[@]}"; do
 	echo "$version: $fullVersion; $shaVal"
 
 	for v in \
-		alpine{3.12,3.11} \
+		alpine{3.13,3.12} \
 		{stretch,buster}{/slim,} \
 	; do
 		dir="$version/$v"