[docker-image] Push versioned build-essential tags

Signed-off-by: Eugenio Paolantonio (g7) <[email protected]>
droidian-releng · Dec 14, 2024 · 10a8be4 · 10a8be4
1 parent 0fc64aa
commit 10a8be4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
@@ -51,3 +51,10 @@ jobs:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: ./src/push_docker_image.sh "${{ matrix.arch }}/${{ matrix.namespace }}/${{ matrix.template }}:${{ matrix.dist }}"
+
+      - name: Deploy versioned image
+        if: "${{ github.ref == 'refs/heads/master' && matrix.template == 'build-essential' }}"
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: ./src/push_docker_image.sh "${{ matrix.arch }}/${{ matrix.namespace }}/${{ matrix.template }}:${{ matrix.dist }}" versioned
diff --git a/src/push_docker_image.sh b/src/push_docker_image.sh
@@ -24,6 +24,14 @@ info "Pushing ${IMAGE}"
 ARCH=$(echo "${IMAGE}" | cut -d"/" -f1)
 TARGET_TAG=quay.io/${IMAGE/"${ARCH}/"/""}-"${ARCH}"
 
+# Handle versioned images
+if [ "${2}" == "versioned" ]; then
+	version="$(docker run --rm -a stdout --entrypoint cat ${IMAGE} /etc/droidian-release)"
+	[ -n "${version}" ] || error "Unable to determine image version"
+
+	TARGET_TAG=$(echo "${TARGET_TAG}" | cut -d":" -f1):"${version}-${ARCH}"
+fi
+
 echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin quay.io
 docker tag "${IMAGE}" "${TARGET_TAG}"
 docker push "${TARGET_TAG}"