add image metadata (os/arch/variant) when importing docker image

requires podman 4.1.0
jpalus · May 8, 2022 · 03e65de · 03e65de
1 parent d8591a9
commit 03e65de
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/release.sh b/release.sh
@@ -152,7 +152,21 @@ publish_dockerhub() {
     error "$SCRIPT_DIR/$RELEASE_NAME.tar.xz does not exist"
   fi
   echo "Publishing release $RELEASE_NAME to Docker Hub"
-  run_log "Importing docker image $DOCKER_TAG" podman import "$SCRIPT_DIR/$RELEASE_NAME.tar.xz" $DOCKER_REGISTRY/$DOCKER_TAG
+  case "$ARCH" in
+    aarch64)
+      IMAGE_ARCH=arm64
+      IMAGE_VARIANT=
+      ;;
+    armv6*)
+      IMAGE_ARCH=arm
+      IMAGE_VARIANT=v6
+      ;;
+    armv7*)
+      IMAGE_ARCH=arm
+      IMAGE_VARIANT=v7
+      ;;
+  esac
+  run_log "Importing docker image $DOCKER_TAG" podman import --os linux --arch $IMAGE_ARCH ${IMAGE_VARIANT:+--variant $IMAGE_VARIANT} "$SCRIPT_DIR/$RELEASE_NAME.tar.xz" $DOCKER_REGISTRY/$DOCKER_TAG
   run_log "Tagging docker image $DOCKER_TAG as latest" podman tag $DOCKER_REGISTRY/$DOCKER_TAG $DOCKER_REGISTRY/$DOCKER_TAG_LATEST
   run_log "Pushing docker tag $DOCKER_TAG" podman push $DOCKER_REGISTRY/$DOCKER_TAG
   run_log "Pushing docker tag $DOCKER_TAG_LATEST" podman push $DOCKER_REGISTRY/$DOCKER_TAG_LATEST