Skip to content

Commit 80d4df4

Browse files
tianonthresheek
authored andcommitted
Update Alpine to 3.7 (for multiarch support)
This also adds an appropriate "Architectures" value to "generate-stackbrew-library.sh". Signed-off-by: Konstantin Pavlov <thresh@nginx.com>
1 parent 26d7731 commit 80d4df4

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

generate-stackbrew-library.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,10 @@ for version in "${versions[@]}"; do
9191
variantAliases=( "${versionAliases[@]/%/-$variant}" )
9292
variantAliases=( "${variantAliases[@]//latest-/}" )
9393

94-
# TODO Architectures once https://github.com/gliderlabs/docker-alpine/issues/304 is resolved
95-
9694
echo
9795
cat <<-EOE
9896
Tags: $(join ', ' "${variantAliases[@]}")
97+
Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
9998
GitCommit: $commit
10099
Directory: $version/$variant
101100
EOE

mainline/alpine-perl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.5
1+
FROM alpine:3.7
22

33
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
44

mainline/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.5
1+
FROM alpine:3.7
22

33
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
44

stable/alpine-perl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.5
1+
FROM alpine:3.7
22

33
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
44

stable/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.5
1+
FROM alpine:3.7
22

33
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
44

0 commit comments

Comments
 (0)