use alpine 3.12 everywhere

more details here: https://alpinelinux.org/posts/Alpine-3.12.0-released.html
flannel-io · Jun 3, 2020 · 8477bba · 8477bba
1 parent 38c583b
commit 8477bba
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 LABEL maintainer="Tom Denham <tom@tigera.io>"
 

diff --git a/Dockerfile.arm b/Dockerfile.arm
@@ -1,4 +1,4 @@
-FROM arm32v6/alpine
+FROM arm32v6/alpine:3.12
 
 LABEL maintainer="Tom Denham <tom@tigera.io>"
 

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine
+FROM arm64v8/alpine:3.12
 
 LABEL maintainer="Tom Denham <tom@tigera.io>"
 

diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
@@ -1,4 +1,4 @@
-FROM ppc64le/alpine
+FROM ppc64le/alpine:3.12
 
 LABEL maintainer="Tom Denham <tom@tigera.io>"
 

diff --git a/Dockerfile.s390x b/Dockerfile.s390x
@@ -1,4 +1,4 @@
-FROM s390x/alpine
+FROM s390x/alpine:3.12
 
 LABEL maintainer="Tom Denham <tom@tigera.io>"
 

diff --git a/images/iperf3/Makefile b/images/iperf3/Makefile
@@ -5,13 +5,13 @@ ARCH ?= amd64
 TEMP_DIR := $(shell mktemp -d)
 
 ifeq ($(ARCH),amd64)
-        BASEIMAGE=alpine:3.6
+        BASEIMAGE=alpine:3.12
 endif
 ifeq ($(ARCH),arm64)
-	BASEIMAGE=aarch64/alpine:3.6
+	BASEIMAGE=aarch64/alpine:3.12
 endif
 ifeq ($(ARCH),ppc64le)
-	BASEIMAGE=ppc64le/alpine:3.6
+	BASEIMAGE=ppc64le/alpine:3.12
 endif
 
 all: container