Merge pull request #670 from darktohka/master

tianon · web-flow · commit 2bf869e35713 · 2021-11-24T14:09:39.000-08:00
Add Alpine 3.15
diff --git a/3.10/alpine3.15/Dockerfile b/3.10/alpine3.15/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.13
+FROM alpine:3.15
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.11-rc/alpine3.15/Dockerfile b/3.11-rc/alpine3.15/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.14
+FROM alpine:3.15
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.6/alpine3.15/Dockerfile b/3.6/alpine3.15/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.13
+FROM alpine:3.15
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.7/alpine3.15/Dockerfile b/3.7/alpine3.15/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.13
+FROM alpine:3.15
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.8/alpine3.15/Dockerfile b/3.8/alpine3.15/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.13
+FROM alpine:3.15
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.9/alpine3.15/Dockerfile b/3.9/alpine3.15/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.13
+FROM alpine:3.15
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -9,7 +9,7 @@ defaultDebianSuite='bullseye'
 declare -A debianSuites=(
 	#[3.10]='bullseye'
 )
-defaultAlpineVersion='3.14'
+defaultAlpineVersion='3.15'
 
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
@@ -78,7 +78,7 @@ for version in "${versions[@]}"; do
 
 	for v in \
 		{bullseye,buster}{,/slim} \
-		alpine{3.14,3.13} \
+		alpine{3.15,3.14} \
 		windows/windowsservercore-{ltsc2022,1809,ltsc2016} \
 	; do
 		dir="$version/$v"
diff --git a/update.sh b/update.sh
@@ -185,7 +185,7 @@ for version in "${versions[@]}"; do
 	echo "$version: $fullVersion (pip $pipVersion, setuptools $setuptoolsVersion)"
 
 	for v in \
-		alpine{3.14,3.13} \
+		alpine{3.15,3.14} \
 		{buster,bullseye}{/slim,} \
 		windows/windowsservercore-{ltsc2022,1809,ltsc2016} \
 	; do

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# PLEASE DO NOT EDIT IT DIRECTLY.`
`5`	`5`	`#`
`6`	`6`
`7`		`-FROM alpine:3.13`
	`7`	`+FROM alpine:3.15`
`8`	`8`
`9`	`9`	`# ensure local python is preferred over distribution python`
`10`	`10`	`ENV PATH /usr/local/bin:$PATH`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# PLEASE DO NOT EDIT IT DIRECTLY.`
`5`	`5`	`#`
`6`	`6`
`7`		`-FROM alpine:3.14`
	`7`	`+FROM alpine:3.15`
`8`	`8`
`9`	`9`	`# ensure local python is preferred over distribution python`
`10`	`10`	`ENV PATH /usr/local/bin:$PATH`