From c62e999c17574e2fbe892aa9c528598a680e79e8 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Thu, 1 Aug 2019 21:49:54 +0200 Subject: [PATCH] Update Alpine images to v3.10 (#238) Signed-off-by: Wouter Born --- 1.8.3/alpine/Dockerfile-amd64 | 2 +- 1.8.3/alpine/Dockerfile-arm64 | 2 +- 1.8.3/alpine/Dockerfile-armhf | 2 +- 2.0.0/alpine/Dockerfile-amd64 | 2 +- 2.0.0/alpine/Dockerfile-arm64 | 2 +- 2.0.0/alpine/Dockerfile-armhf | 2 +- 2.1.0/alpine/Dockerfile-amd64 | 2 +- 2.1.0/alpine/Dockerfile-arm64 | 2 +- 2.1.0/alpine/Dockerfile-armhf | 2 +- 2.2.0/alpine/Dockerfile-amd64 | 2 +- 2.2.0/alpine/Dockerfile-arm64 | 2 +- 2.2.0/alpine/Dockerfile-armhf | 2 +- 2.3.0/alpine/Dockerfile-amd64 | 2 +- 2.3.0/alpine/Dockerfile-arm64 | 2 +- 2.3.0/alpine/Dockerfile-armhf | 2 +- 2.4.0/alpine/Dockerfile-amd64 | 2 +- 2.4.0/alpine/Dockerfile-arm64 | 2 +- 2.4.0/alpine/Dockerfile-armhf | 2 +- 2.5.0-snapshot/alpine/Dockerfile-amd64 | 2 +- 2.5.0-snapshot/alpine/Dockerfile-arm64 | 2 +- 2.5.0-snapshot/alpine/Dockerfile-armhf | 2 +- 2.5.0.M1/alpine/Dockerfile-amd64 | 2 +- 2.5.0.M1/alpine/Dockerfile-arm64 | 2 +- 2.5.0.M1/alpine/Dockerfile-armhf | 2 +- README.md | 2 +- update-docker-files.sh | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/1.8.3/alpine/Dockerfile-amd64 b/1.8.3/alpine/Dockerfile-amd64 index 151b8675..08e6e400 100644 --- a/1.8.3/alpine/Dockerfile-amd64 +++ b/1.8.3/alpine/Dockerfile-amd64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:amd64-v3.9 +FROM multiarch/alpine:amd64-v3.10 # Set download urls ENV \ diff --git a/1.8.3/alpine/Dockerfile-arm64 b/1.8.3/alpine/Dockerfile-arm64 index 4a08a2e3..3fc71beb 100644 --- a/1.8.3/alpine/Dockerfile-arm64 +++ b/1.8.3/alpine/Dockerfile-arm64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:arm64-v3.9 +FROM multiarch/alpine:arm64-v3.10 # Set download urls ENV \ diff --git a/1.8.3/alpine/Dockerfile-armhf b/1.8.3/alpine/Dockerfile-armhf index 86177bbb..08d3977e 100644 --- a/1.8.3/alpine/Dockerfile-armhf +++ b/1.8.3/alpine/Dockerfile-armhf @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:armhf-v3.9 +FROM multiarch/alpine:armhf-v3.10 # Set download urls ENV \ diff --git a/2.0.0/alpine/Dockerfile-amd64 b/2.0.0/alpine/Dockerfile-amd64 index 79b46c3c..968f9851 100644 --- a/2.0.0/alpine/Dockerfile-amd64 +++ b/2.0.0/alpine/Dockerfile-amd64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:amd64-v3.9 +FROM multiarch/alpine:amd64-v3.10 # Set download urls ENV \ diff --git a/2.0.0/alpine/Dockerfile-arm64 b/2.0.0/alpine/Dockerfile-arm64 index a2759341..af49f5ea 100644 --- a/2.0.0/alpine/Dockerfile-arm64 +++ b/2.0.0/alpine/Dockerfile-arm64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:arm64-v3.9 +FROM multiarch/alpine:arm64-v3.10 # Set download urls ENV \ diff --git a/2.0.0/alpine/Dockerfile-armhf b/2.0.0/alpine/Dockerfile-armhf index 91025127..cf3f81ce 100644 --- a/2.0.0/alpine/Dockerfile-armhf +++ b/2.0.0/alpine/Dockerfile-armhf @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:armhf-v3.9 +FROM multiarch/alpine:armhf-v3.10 # Set download urls ENV \ diff --git a/2.1.0/alpine/Dockerfile-amd64 b/2.1.0/alpine/Dockerfile-amd64 index 916e1821..d5d1ff19 100644 --- a/2.1.0/alpine/Dockerfile-amd64 +++ b/2.1.0/alpine/Dockerfile-amd64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:amd64-v3.9 +FROM multiarch/alpine:amd64-v3.10 # Set download urls ENV \ diff --git a/2.1.0/alpine/Dockerfile-arm64 b/2.1.0/alpine/Dockerfile-arm64 index 5cc9af69..25df1ae3 100644 --- a/2.1.0/alpine/Dockerfile-arm64 +++ b/2.1.0/alpine/Dockerfile-arm64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:arm64-v3.9 +FROM multiarch/alpine:arm64-v3.10 # Set download urls ENV \ diff --git a/2.1.0/alpine/Dockerfile-armhf b/2.1.0/alpine/Dockerfile-armhf index 0aae476c..48bf7c66 100644 --- a/2.1.0/alpine/Dockerfile-armhf +++ b/2.1.0/alpine/Dockerfile-armhf @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:armhf-v3.9 +FROM multiarch/alpine:armhf-v3.10 # Set download urls ENV \ diff --git a/2.2.0/alpine/Dockerfile-amd64 b/2.2.0/alpine/Dockerfile-amd64 index 706d030e..dae7f560 100644 --- a/2.2.0/alpine/Dockerfile-amd64 +++ b/2.2.0/alpine/Dockerfile-amd64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:amd64-v3.9 +FROM multiarch/alpine:amd64-v3.10 # Set download urls ENV \ diff --git a/2.2.0/alpine/Dockerfile-arm64 b/2.2.0/alpine/Dockerfile-arm64 index b4c27588..e3a50acb 100644 --- a/2.2.0/alpine/Dockerfile-arm64 +++ b/2.2.0/alpine/Dockerfile-arm64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:arm64-v3.9 +FROM multiarch/alpine:arm64-v3.10 # Set download urls ENV \ diff --git a/2.2.0/alpine/Dockerfile-armhf b/2.2.0/alpine/Dockerfile-armhf index 9a039682..d322d667 100644 --- a/2.2.0/alpine/Dockerfile-armhf +++ b/2.2.0/alpine/Dockerfile-armhf @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:armhf-v3.9 +FROM multiarch/alpine:armhf-v3.10 # Set download urls ENV \ diff --git a/2.3.0/alpine/Dockerfile-amd64 b/2.3.0/alpine/Dockerfile-amd64 index f3251f00..cf7771f4 100644 --- a/2.3.0/alpine/Dockerfile-amd64 +++ b/2.3.0/alpine/Dockerfile-amd64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:amd64-v3.9 +FROM multiarch/alpine:amd64-v3.10 # Set download urls ENV \ diff --git a/2.3.0/alpine/Dockerfile-arm64 b/2.3.0/alpine/Dockerfile-arm64 index a9826aed..10a53c4c 100644 --- a/2.3.0/alpine/Dockerfile-arm64 +++ b/2.3.0/alpine/Dockerfile-arm64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:arm64-v3.9 +FROM multiarch/alpine:arm64-v3.10 # Set download urls ENV \ diff --git a/2.3.0/alpine/Dockerfile-armhf b/2.3.0/alpine/Dockerfile-armhf index 3cd4f7b3..7b236c9f 100644 --- a/2.3.0/alpine/Dockerfile-armhf +++ b/2.3.0/alpine/Dockerfile-armhf @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:armhf-v3.9 +FROM multiarch/alpine:armhf-v3.10 # Set download urls ENV \ diff --git a/2.4.0/alpine/Dockerfile-amd64 b/2.4.0/alpine/Dockerfile-amd64 index 6f90ef11..06ece8d8 100644 --- a/2.4.0/alpine/Dockerfile-amd64 +++ b/2.4.0/alpine/Dockerfile-amd64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:amd64-v3.9 +FROM multiarch/alpine:amd64-v3.10 # Set download urls ENV \ diff --git a/2.4.0/alpine/Dockerfile-arm64 b/2.4.0/alpine/Dockerfile-arm64 index 09704139..3524bd88 100644 --- a/2.4.0/alpine/Dockerfile-arm64 +++ b/2.4.0/alpine/Dockerfile-arm64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:arm64-v3.9 +FROM multiarch/alpine:arm64-v3.10 # Set download urls ENV \ diff --git a/2.4.0/alpine/Dockerfile-armhf b/2.4.0/alpine/Dockerfile-armhf index 59686d83..5e807043 100644 --- a/2.4.0/alpine/Dockerfile-armhf +++ b/2.4.0/alpine/Dockerfile-armhf @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:armhf-v3.9 +FROM multiarch/alpine:armhf-v3.10 # Set download urls ENV \ diff --git a/2.5.0-snapshot/alpine/Dockerfile-amd64 b/2.5.0-snapshot/alpine/Dockerfile-amd64 index 24b11869..d9f5a873 100644 --- a/2.5.0-snapshot/alpine/Dockerfile-amd64 +++ b/2.5.0-snapshot/alpine/Dockerfile-amd64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:amd64-v3.9 +FROM multiarch/alpine:amd64-v3.10 # Set download urls ENV \ diff --git a/2.5.0-snapshot/alpine/Dockerfile-arm64 b/2.5.0-snapshot/alpine/Dockerfile-arm64 index 363be6f8..f0c00d08 100644 --- a/2.5.0-snapshot/alpine/Dockerfile-arm64 +++ b/2.5.0-snapshot/alpine/Dockerfile-arm64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:arm64-v3.9 +FROM multiarch/alpine:arm64-v3.10 # Set download urls ENV \ diff --git a/2.5.0-snapshot/alpine/Dockerfile-armhf b/2.5.0-snapshot/alpine/Dockerfile-armhf index c87175ba..d805c355 100644 --- a/2.5.0-snapshot/alpine/Dockerfile-armhf +++ b/2.5.0-snapshot/alpine/Dockerfile-armhf @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:armhf-v3.9 +FROM multiarch/alpine:armhf-v3.10 # Set download urls ENV \ diff --git a/2.5.0.M1/alpine/Dockerfile-amd64 b/2.5.0.M1/alpine/Dockerfile-amd64 index c9ee1dab..139049ad 100644 --- a/2.5.0.M1/alpine/Dockerfile-amd64 +++ b/2.5.0.M1/alpine/Dockerfile-amd64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:amd64-v3.9 +FROM multiarch/alpine:amd64-v3.10 # Set download urls ENV \ diff --git a/2.5.0.M1/alpine/Dockerfile-arm64 b/2.5.0.M1/alpine/Dockerfile-arm64 index 038e7233..0281720d 100644 --- a/2.5.0.M1/alpine/Dockerfile-arm64 +++ b/2.5.0.M1/alpine/Dockerfile-arm64 @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:arm64-v3.9 +FROM multiarch/alpine:arm64-v3.10 # Set download urls ENV \ diff --git a/2.5.0.M1/alpine/Dockerfile-armhf b/2.5.0.M1/alpine/Dockerfile-armhf index 87f669a0..f37453b7 100644 --- a/2.5.0.M1/alpine/Dockerfile-armhf +++ b/2.5.0.M1/alpine/Dockerfile-armhf @@ -6,7 +6,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ # -FROM multiarch/alpine:armhf-v3.9 +FROM multiarch/alpine:armhf-v3.10 # Set download urls ENV \ diff --git a/README.md b/README.md index 167ac1b2..4cc6903f 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ Newer Docker versions (1.10.0+) have multi-architecture support which allows for **Distributions:** * `debian` for Debian 10 "buster" (default when not specified in tag) -* `alpine` for Alpine 3.9 +* `alpine` for Alpine 3.10 The Alpine images are substantially smaller than the Debian images but may be less compatible because OpenJDK is used (see [Prerequisites](https://www.openhab.org/docs/installation/#prerequisites) for known disadvantages). diff --git a/update-docker-files.sh b/update-docker-files.sh index a6057985..94fec675 100755 --- a/update-docker-files.sh +++ b/update-docker-files.sh @@ -63,7 +63,7 @@ print_baseimage() { # Set Docker base image based on distributions case $base in alpine) - base_image="alpine:$arch-v3.9" + base_image="alpine:$arch-v3.10" ;; debian) base_image="debian-debootstrap:$arch-buster"