Add manifest creation for bake.

Author: viferga

.github/workflows/docker-hub.yml

@@ -155,10 +155,15 @@ jobs:
     needs: [matrix, build]
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout Repository
+        uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+
       - name: Download digests
         uses: actions/[email protected]
         with:
-          path: /tmp/digests
+          path: .bake/digests/
           pattern: digests-*
           merge-multiple: true
 
@@ -180,86 +185,5 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Create manifest list and push
-        working-directory: /tmp/digests
         run: |
-          ls -laR
-
-      # TODO:
-      # - name: Create manifest list and push
-      #   working-directory: /tmp/digests
-      #   run: |
-      #     IMAGE_HASHES=$(printf '${{ env.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
-      #     docker buildx imagetools create -t ${{ env.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:latest $IMAGE_HASHES
-      #     if [[ "${{ contains(github.ref, 'refs/tags/') }}" = true ]]; then
-      #       TAG=${GITHUB_REF#refs/*/}
-      #       VERSION=${TAG#v}
-      #       docker buildx imagetools create -t ${{ env.REGISTRY_IMAGE }}:${VERSION} $IMAGE_HASHES
-      #     fi
-
-      # - name: Inspect image
-      #   run: |
-      #     docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:latest
-
-
-
-
-  # manifest:
-  #   name: Create and Push Manifest Lists
-  #   needs: [matrix, build]
-  #   # Only run when master or when tagging a version
-  #   if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.event_name != 'pull_request'
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Login to Docker Hub
-  #       uses: docker/login-action@v3
-  #       with:
-  #         username: ${{ secrets.DOCKER_HUB_USERNAME }}
-  #         password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
-  #     - name: Create and Push Manifest Lists
-  #       run: |
-  #         set -exuo pipefail
-
-  #         tags=("deps" "dev" "runtime" "cli")
-  #         platforms=($(echo '${{ needs.matrix.outputs.platform_list }}' | jq -r '.[]'))
-
-  #         echo "Create all the tags by platform"
-
-  #         for tag in "${tags[@]}"; do
-  #           echo "Creating manifest for tag: $tag"
-  #           platform_tags=""
-  #           for platform in "${platforms[@]}"; do
-  #             platform_tag=$(echo "${platform}" | tr '/' '-')
-  #             platform_tags="${platform_tags} ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag}-${platform_tag}"
-  #           done
-  #           echo "Creating manifest with tags: ${platform_tags}"
-  #           docker manifest create ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag} ${platform_tags} --amend
-  #           docker manifest push ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag}
-  #         done
-
-  #         echo "Create the latest tag"
-
-  #         cli_platform_tags=""
-  #         for platform in "${platforms[@]}"; do
-  #             platform_tag=$(echo "${platform}" | tr '/' '-')
-  #           cli_platform_tags="${cli_platform_tags} ${DOCKER_USERNAME}/${IMAGE_NAME}:cli-${platform_tag}"
-  #         done
-  #         docker manifest create ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:latest ${cli_platform_tags} --amend
-  #         docker manifest push ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:latest
-
-  #         if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" = true ]]; then
-  #           VERSION=${GITHUB_REF#refs/tags/v}
-
-  #           echo "Create the version ${VERSION} tag"
-
-  #           for tag in "${tags[@]}"; do
-  #             platform_tags=""
-  #             for platform in "${platforms[@]}"; do
-  #               platform_tag=$(echo "${platform}" | tr '/' '-')
-  #               platform_tags="${platform_tags} ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag}-${platform_tag}"
-  #             done
-  #             docker manifest create ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${VERSION}-${tag} ${platform_tags} --amend
-  #             docker manifest push ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${VERSION}-${tag}
-  #           done
-  #         fi
-
+          ./docker-compose.sh manifest

docker-compose.sh

@@ -208,7 +208,7 @@ sub_platform() {
 	rm -rf docker-compose.bake.yml
 }
 
-# Build MetaCall Docker Compose with multi-platform specifier
+# Build MetaCall Docker Bake with multi-platform specifier
 sub_bake() {
 	if [ -z "${METACALL_PLATFORM+x}" ]; then
 		echo "Error: METACALL_PLATFORM variable not defined"
@@ -266,6 +266,36 @@ sub_bake() {
 	done
 }
 
+# Create Manifest for multi-platform images from Docker Bake
+sub_manifest() {
+	if [ -z "${DOCKER_USERNAME+x}" ]; then
+		echo "Error: IMAGE_NAME variable not defined"
+		exit 1
+	fi
+
+	if [ -z "${IMAGE_NAME+x}" ]; then
+		echo "Error: IMAGE_NAME variable not defined"
+		exit 1
+	fi
+
+	# Get current directory
+	workdir=$(pwd)
+
+	for tag in "${METACALL_TAGS[@]}"; do
+		cd "${workdir}/.bake/digests/${tag}"
+		image_hashes=$(printf '${DOCKER_USERNAME}/${IMAGE_NAME}@sha256:%s ' *)
+		docker buildx imagetools create -t ${DOCKER_USERNAME}/${IMAGE_NAME}:${tag} ${image_hashes}
+		# TODO: Implement versions for each tag
+		docker buildx imagetools inspect ${DOCKER_USERNAME}/${IMAGE_NAME}:${tag}
+
+		if [[ "${tag}" == "cli" ]]; then
+			docker buildx imagetools create -t ${DOCKER_USERNAME}/${IMAGE_NAME}:latest ${image_hashes}
+			docker buildx imagetools inspect ${DOCKER_USERNAME}/${IMAGE_NAME}:latest
+			# TODO: Implement version for latest
+		fi
+	done
+}
+
 # Push MetaCall Docker Compose
 sub_push() {
 	if [ -z "${IMAGE_NAME+x}" ]; then
@@ -389,6 +419,9 @@ case "$1" in
 	bake)
 		sub_bake
 		;;
+	manifest)
+		sub_manifest
+		;;
 	push)
 		sub_push
 		;;