replaced buster-slim by alpine

JmStawikowski · Aug 22, 2019 · 2e35e37 · 2e35e37
1 parent 9cbef5a
commit 2e35e37
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 65 deletions.
diff --git a/.docker/Dockerfile.alpine b/.docker/Dockerfile.alpine
@@ -38,6 +38,7 @@ COPY .docker/scripts/* /tmp/
 RUN set -ex && \
     apk add --no-cache \
         bash \
+        tzdata \
         iputils \
         curl \
         nano \

diff --git a/.docker/Dockerfile.slim b/.docker/Dockerfile.slim
@@ -37,6 +37,7 @@ COPY .docker/scripts/* /tmp/
 # Install tools, create Node-RED app and data dir, add user and set rights
 RUN set -ex && \
     apt-get update && apt-get install -y --no-install-recommends \
+        tzdata \
         iputils-ping \
         curl \
         nano \

diff --git a/.docker/docker.sh b/.docker/docker.sh
@@ -139,12 +139,12 @@ docker_manifest_list_version() {
   docker manifest create ${TARGET}:${BUILD_VERSION} \
       ${TARGET}:${BUILD_VERSION}-10-alpine-amd64 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7 \
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8
 
   # Manifest Annotate BUILD_VERSION
   docker manifest annotate ${TARGET}:${BUILD_VERSION} ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:${BUILD_VERSION} ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:${BUILD_VERSION} ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7 --os=linux --arch=arm --variant=v7
   docker manifest annotate ${TARGET}:${BUILD_VERSION} ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8 --os=linux --arch=arm64 --variant=v8
 
   # Manifest Push BUILD_VERSION
@@ -157,12 +157,12 @@ docker_manifest_list_version_python3() {
   docker manifest create ${TARGET}:${BUILD_VERSION}-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-amd64-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3 \
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python3
 
   # Manifest Annotate BUILD_VERSION-python3
   docker manifest annotate ${TARGET}:${BUILD_VERSION}-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:${BUILD_VERSION}-python3 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:${BUILD_VERSION}-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3 --os=linux --arch=arm --variant=v7
   docker manifest annotate ${TARGET}:${BUILD_VERSION}-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python3 --os=linux --arch=arm64 --variant=v8
 
   # Manifest Push BUILD_VERSION-python3
@@ -175,12 +175,12 @@ docker_manifest_list_version_python2() {
   docker manifest create ${TARGET}:${BUILD_VERSION}-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-amd64-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2 \
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python2
 
   # Manifest Annotate BUILD_VERSION-python2
   docker manifest annotate ${TARGET}:${BUILD_VERSION}-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:${BUILD_VERSION}-python2 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:${BUILD_VERSION}-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2 --os=linux --arch=arm --variant=v7
   docker manifest annotate ${TARGET}:${BUILD_VERSION}-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python2 --os=linux --arch=arm64 --variant=v8
 
   # Manifest Push BUILD_VERSION-python2
@@ -193,12 +193,12 @@ docker_manifest_list_latest() {
   docker manifest create ${TARGET}:latest \
       ${TARGET}:${BUILD_VERSION}-10-alpine-amd64 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7 \
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8
 
   # Manifest Annotate LATEST
   docker manifest annotate ${TARGET}:latest ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:latest ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:latest ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7 --os=linux --arch=arm --variant=v7
   docker manifest annotate ${TARGET}:latest ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8 --os=linux --arch=arm64 --variant=v8
 
   # Manifest Push LATEST
@@ -211,12 +211,12 @@ docker_manifest_list_testing() {
   docker manifest create ${TARGET}:testing \
       ${TARGET}:${BUILD_VERSION}-10-alpine-amd64 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7 \
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8
 
   # Manifest Annotate TESTING
   docker manifest annotate ${TARGET}:testing ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:testing ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:testing ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7 --os=linux --arch=arm --variant=v7
   docker manifest annotate ${TARGET}:testing ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8 --os=linux --arch=arm64 --variant=v8
 
   # Manifest Push TESTING
@@ -229,12 +229,12 @@ docker_manifest_list_testing_python3() {
   docker manifest create ${TARGET}:testing-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-amd64-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3 \
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python3
 
   # Manifest Annotate TESTING-PYTHON3
   docker manifest annotate ${TARGET}:testing-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:testing-python3 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:testing-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3 --os=linux --arch=arm --variant=v7
   docker manifest annotate ${TARGET}:testing-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python3 --os=linux --arch=arm64 --variant=v8
 
   # Manifest Push TESTING-PYTHON3
@@ -247,12 +247,12 @@ docker_manifest_list_testing_python2() {
   docker manifest create ${TARGET}:testing-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-amd64-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2 \
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python2
 
   # Manifest Annotate TESTING-PYTHON2
   docker manifest annotate ${TARGET}:testing-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:testing-python2 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:testing-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2 --os=linux --arch=arm --variant=v7
   docker manifest annotate ${TARGET}:testing-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python2 --os=linux --arch=arm64 --variant=v8
 
   # Manifest Push TESTING-PYTHON2
@@ -265,12 +265,12 @@ docker_manifest_list_latest_python3() {
   docker manifest create ${TARGET}:latest-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-amd64-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3 \
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python3
 
   # Manifest Annotate latest_python3
   docker manifest annotate ${TARGET}:latest-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:latest-python3 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:latest-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3 --os=linux --arch=arm --variant=v7
   docker manifest annotate ${TARGET}:latest-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python3 --os=linux --arch=arm64 --variant=v8
 
   # Manifest Push latest_python3
@@ -283,12 +283,12 @@ docker_manifest_list_latest_python2() {
   docker manifest create ${TARGET}:latest-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-amd64-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2 \
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python2
 
   # Manifest Annotate latest_python2
   docker manifest annotate ${TARGET}:latest-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:latest-python2 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:latest-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2 --os=linux --arch=arm --variant=v7
   docker manifest annotate ${TARGET}:latest-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm64v8-python2 --os=linux --arch=arm64 --variant=v8
 
   # Manifest Push latest_python2
@@ -300,11 +300,11 @@ docker_manifest_list_latest_rpi() {
   echo "DOCKER MANIFEST: Create and Push docker manifest list - ${TARGET}:latest-rpi."
   docker manifest create ${TARGET}:latest-rpi \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7
 
   # Manifest Annotate rpi
   docker manifest annotate ${TARGET}:latest-rpi ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:latest-rpi ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:latest-rpi ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7 --os=linux --arch=arm --variant=v7
 
   # Manifest Push rpi
   docker manifest push ${TARGET}:latest-rpi
@@ -315,11 +315,11 @@ docker_manifest_list_latest_rpi_python2() {
   echo "DOCKER MANIFEST: Create and Push docker manifest list - ${TARGET}:latest-rpi-python2."
   docker manifest create ${TARGET}:latest-rpi-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2
 
   # Manifest Annotate latest-rpi-python2
   docker manifest annotate ${TARGET}:latest-rpi-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:latest-rpi-python2 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:latest-rpi-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2 --os=linux --arch=arm --variant=v7
 
   # Manifest Push latest-rpi-python2
   docker manifest push ${TARGET}:latest-rpi-python2
@@ -330,11 +330,11 @@ docker_manifest_list_latest_rpi_python3() {
   echo "DOCKER MANIFEST: Create and Push docker manifest list - ${TARGET}:latest-rpi-python3."
   docker manifest create ${TARGET}:latest-rpi-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3
 
   # Manifest Annotate latest-rpi-python3
   docker manifest annotate ${TARGET}:latest-rpi-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:latest-rpi-python3 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:latest-rpi-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3 --os=linux --arch=arm --variant=v7
 
   # Manifest Push latest-rpi-python3
   docker manifest push ${TARGET}:latest-rpi-python3
@@ -345,11 +345,11 @@ docker_manifest_list_version_rpi() {
   echo "DOCKER MANIFEST: Create and Push docker manifest list - ${TARGET}:${BUILD_VERSION}-rpi."
   docker manifest create ${TARGET}:${BUILD_VERSION}-rpi \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7
 
   # Manifest Annotate rpi
   docker manifest annotate ${TARGET}:${BUILD_VERSION}-rpi ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:${BUILD_VERSION}-rpi ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:${BUILD_VERSION}-rpi ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7 --os=linux --arch=arm --variant=v7
 
   # Manifest Push rpi
   docker manifest push ${TARGET}:${BUILD_VERSION}-rpi
@@ -360,11 +360,11 @@ docker_manifest_list_testing_rpi() {
   echo "DOCKER MANIFEST: Create and Push docker manifest list - ${TARGET}:testing-rpi."
   docker manifest create ${TARGET}:testing-rpi \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7
 
   # Manifest Annotate rpi
   docker manifest annotate ${TARGET}:testing-rpi ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:testing-rpi ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:testing-rpi ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7 --os=linux --arch=arm --variant=v7
 
   # Manifest Push rpi
   docker manifest push ${TARGET}:testing-rpi
@@ -375,11 +375,11 @@ docker_manifest_list_testing_rpi_python3() {
   echo "DOCKER MANIFEST: Create and Push docker manifest list - ${TARGET}:testing-rpi-python3."
   docker manifest create ${TARGET}:testing-rpi-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3
 
   # Manifest Annotate testing-rpi-python3
   docker manifest annotate ${TARGET}:testing-rpi-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:testing-rpi-python3 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:testing-rpi-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3 --os=linux --arch=arm --variant=v7
 
   # Manifest Push testing-rpi-python3
   docker manifest push ${TARGET}:testing-rpi-python3
@@ -390,11 +390,11 @@ docker_manifest_list_testing_rpi_python2() {
   echo "DOCKER MANIFEST: Create and Push docker manifest list - ${TARGET}:testing-rpi-python2."
   docker manifest create ${TARGET}:testing-rpi-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2
 
   # Manifest Annotate testing-rpi-python2
   docker manifest annotate ${TARGET}:testing-rpi-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:testing-rpi-python2 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:testing-rpi-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2 --os=linux --arch=arm --variant=v7
 
   # Manifest Push testing-rpi-python2
   docker manifest push ${TARGET}:testing-rpi-python2
@@ -405,11 +405,11 @@ docker_manifest_list_version_rpi_python3() {
   echo "DOCKER MANIFEST: Create and Push docker manifest list - ${TARGET}:${BUILD_VERSION}-rpi-python3."
   docker manifest create ${TARGET}:${BUILD_VERSION}-rpi-python3 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3
 
   # Manifest Annotate ${BUILD_VERSION}-rpi-python3
   docker manifest annotate ${TARGET}:${BUILD_VERSION}-rpi-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python3 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:${BUILD_VERSION}-rpi-python3 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python3 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:${BUILD_VERSION}-rpi-python3 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python3 --os=linux --arch=arm --variant=v7
 
   # Manifest Push ${BUILD_VERSION}-rpi-python3
   docker manifest push ${TARGET}:${BUILD_VERSION}-rpi-python3
@@ -420,11 +420,11 @@ docker_manifest_list_version_rpi_python2() {
   echo "DOCKER MANIFEST: Create and Push docker manifest list - ${TARGET}:${BUILD_VERSION}-rpi-python2."
   docker manifest create ${TARGET}:${BUILD_VERSION}-rpi-python2 \
       ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 \
-      ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2
+      ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2
 
   # Manifest Annotate ${BUILD_VERSION}-rpi-python2
   docker manifest annotate ${TARGET}:${BUILD_VERSION}-rpi-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v6-python2 --os=linux --arch=arm --variant=v6
-  docker manifest annotate ${TARGET}:${BUILD_VERSION}-rpi-python2 ${TARGET}:${BUILD_VERSION}-10-buster-slim-arm32v7-python2 --os=linux --arch=arm --variant=v7
+  docker manifest annotate ${TARGET}:${BUILD_VERSION}-rpi-python2 ${TARGET}:${BUILD_VERSION}-10-alpine-arm32v7-python2 --os=linux --arch=arm --variant=v7
 
   # Manifest Push ${BUILD_VERSION}-rpi-python2
   docker manifest push ${TARGET}:${BUILD_VERSION}-rpi-python2