8000 Merge pull request #621 from J0WI/alpine-3.14 · xz4950/python@83ed60b · GitHub
[go: up one dir, main page]
Skip to content

Commit 83ed60b

Browse files
yosifkityosifkit
authored
Merge pull request docker-library#621 from J0WI/alpine-3.14
Add Alpine 3.14
2 parents 7ab4f6d + de6d03f commit 83ed60b

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

‎3.10-rc/alpine3.12/Dockerfile renamed to ‎3.10-rc/alpine3.14/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.12
7+
FROM alpine:3.14
88

99
# ensure local python is preferred over distribution python
1010
ENV PATH /usr/local/bin:$PATH

‎3.6/alpine3.12/Dockerfile renamed to ‎3.6/alpine3.14/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.12
7+
FROM alpine:3.14
88

99
# ensure local python is preferred over distribution python
1010
ENV PATH /usr/local/bin:$PATH

‎3.7/alpine3.12/Dockerfile renamed to ‎3.7/alpine3.14/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.12
7+
FROM alpine:3.14
88

99
# ensure local python is preferred over distribution python
1010
ENV PATH /usr/local/bin:$PATH

‎3.8/alpine3.12/Dockerfile renamed to ‎3.8/alpine3.14/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.12
7+
FROM alpine:3.14
88

99
# ensure local python is preferred over distribution python
1010
ENV PATH /usr/local/bin:$PATH

‎3.9/alpine3.12/Dockerfile renamed to ‎3.9/alpine3.14/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.12
7+
FROM alpine:3.14
88

99
# ensure local python is preferred over distribution python
1010
ENV PATH /usr/local/bin:$PATH

‎generate-stackbrew-library.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ defaultDebianSuite='buster' # TODO buster
1010
declare -A debianSuites=(
1111
#[3.8-rc]='buster'
1212
)
13-
defaultAlpineVersion='3.13'
13+
defaultAlpineVersion='3.14'
1414

1515
self="$(basename "$BASH_SOURCE")"
1616
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
@@ -79,7 +79,7 @@ for version in "${versions[@]}"; do
7979

8080
for v in \
8181
{buster,stretch}{,/slim} \
82-
alpine{3.13,3.12} \
82+
alpine{3.14,3.13} \
8383
windows/windowsservercore-{1809,ltsc2016} \
8484
; do
8585
dir="$version/$v"

‎update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ for version in "${versions[@]}"; do
132132
echo "$version: $fullVersion"
133133

134134
for v in \
135-
alpine{3.12,3.13} \
135+
alpine{3.14,3.13} \
136136
{stretch,buster}{/slim,} \
137137
windows/windowsservercore-{1809,ltsc2016} \
138138
; do

0 commit comments

Comments
 (0)
0