dockerifle

legleux · Dec 10, 2024 · 55a1955 · 55a1955
1 parent e32d6a3
commit 55a1955
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -88,24 +88,24 @@ jobs:
           docker buildx build .  --build-arg PLATFORM="${ARCH}" --tag "${IMAGE}-${ARCH}" --push
 
 
-  # create-multiarch-manifests:
-  #     needs: build_image
-  #     runs-on: ubuntu-latest
-  #     steps:
-  #       - name: Log in to the gchr
-  #         uses: docker/login-action@v3
-  #         with:
-  #           registry: ${{ env.REGISTRY }}
-  #           username: ${{ github.actor }}
-  #           password: ${{ secrets.GITHUB_TOKEN }}
-  #       - name: Create multiarch manifests
-  #         run: |
-  #           # TODO: check if both images are present. If only one is, just build with that one as we'd rather have
-  #           # a single arch image rather than no images at all. (maybe specifically the amd64)
-  #           set -x
-  #           IMAGE_TAG=${{ needs.build_image.outputs.image }}
-  #           git_sha=${{ needs.build_image.outputs.git_sha }}
+  create-multiarch-manifests:
+      needs: build_image
+      runs-on: ubuntu-latest
+      steps:
+        - name: Log in to the gchr
+          uses: docker/login-action@v3
+          with:
+            registry: ${{ env.REGISTRY }}
+            username: ${{ github.actor }}
+            password: ${{ secrets.GITHUB_TOKEN }}
+        - name: Create multiarch manifests
+          run: |
+            # TODO: check if both images are present. If only one is, just build with that one as we'd rather have
+            # a single arch image rather than no images at all. (maybe specifically the amd64)
+            set -x
+            IMAGE_TAG=${{ needs.build_image.outputs.image }}
+            git_sha=${{ needs.build_image.outputs.git_sha }}
 
-  #           docker buildx imagetools create --tag ${IMAGE_TAG} \
-  #                 ${IMAGE_TAG}-amd64 \
-  #                 ${IMAGE_TAG}-arm64
+            docker buildx imagetools create --tag ${IMAGE_TAG} \
+                  ${IMAGE_TAG}-amd64 \
+                  ${IMAGE_TAG}-arm64
diff --git a/Dockerfile b/Dockerfile
@@ -16,5 +16,6 @@ RUN apt-get update && apt-get install -y \
 
 # Dev helpers tree
 RUN apt-get update && apt-get install -y \
-    tree \
-RUN pip install
+    cmake \
+    tree
+RUN pip install cupcake "conan<2"