split the manifest step into a separate skript

build.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 set -euxo pipefail
-
-ARCH=$(uname -m)
-
-TAG=${TAG:-"latest"}
-ARCHTAG="$TAG-$ARCH"
+. docker/env
 
 docker build --pull -t openwebrx-base:$ARCHTAG -f docker/Dockerfiles/Dockerfile-base .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-rtlsdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-rtlsdr .

docker/env

@@ -0,0 +1,5 @@
+ARCH=$(uname -m)
+IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-full openwebrx"
+ALL_ARCHS="x86_64 armv7l aarch64"
+TAG=${TAG:-"latest"}
+ARCHTAG="$TAG-$ARCH"

manifest.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -euxo pipefail
+. docker/env
+
+for image in ${IMAGES}; do
+  # there's no docker manifest rm command, and the create --amend does not work, so we have to clean up manually
+  rm -rf "${HOME}/.docker/manifests/docker.io_jketterl_${image}-${TAG}"
+  IMAGE_LIST=""
+  for a in $ALL_ARCHS; do
+    IMAGE_LIST="$IMAGE_LIST jketterl/$image:$TAG-$a"
+  done
+  docker manifest create jketterl/$image:$TAG $IMAGE_LIST
+  docker manifest push --purge jketterl/$image:$TAG
+  docker pull jketterl/$image:$TAG
+done

push.sh

@@ -1,26 +1,7 @@
 #!/bin/bash
 set -euxo pipefail
-
-ARCH=$(uname -m)
-
-ALL_ARCHS="x86_64 armv7l aarch64"
-TAG=${TAG:-"latest"}
-ARCHTAG="$TAG-$ARCH"
-
-IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-full openwebrx"
+. docker/env
 
 for image in ${IMAGES}; do
   docker push jketterl/$image:$ARCHTAG
-done
-
-for image in ${IMAGES}; do
-  # there's no docker manifest rm command, and the create --amend does not work, so we have to clean up manually
-  rm -rf "${HOME}/.docker/manifests/docker.io_jketterl_${image}-${TAG}"
-  IMAGE_LIST=""
-  for a in $ALL_ARCHS; do
-    IMAGE_LIST="$IMAGE_LIST jketterl/$image:$TAG-$a"
-  done
-  docker manifest create jketterl/$image:$TAG $IMAGE_LIST
-  docker manifest push --purge jketterl/$image:$TAG
-  docker pull jketterl/$image:$TAG
-done
+done