dadas

DIRACGrid · Nov 23, 2023 · db0a8a2 · db0a8a2
1 parent 29e07a6
commit db0a8a2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -72,29 +72,30 @@ jobs:
           mkdir output-base
           tar -C output-base -xf output-base.tar
 
-      - name: Build and push services-base
-        run: |
-          echo "CHRIS digets ${{steps.build_base.outputs.digest}}"
-          echo "CHRIS image_id ${{steps.build_base.outputs.imageid}}"
-
-      - name: Build and push services-base
+      - name: Build services-base
         uses: docker/build-push-action@v5
         with:
           context: services-base
           build-contexts: |
-            foo=oci-layout://output-base@${{steps.build_base.outputs.digest}}
+            diracx/base=oci-layout://output-base@${{steps.build_base.outputs.digest}}
           outputs: type=oci,dest=output-services-base.tar
           tags: ghcr.io/diracgrid/diracx/services-base:latest
           platforms: linux/amd64,linux/arm64
-      - name: Extract base
+      - name: Extract services-base
         run: |
+          mkdir output-services-base
           tar -C output-services-base -xf output-services-base.tar
 
-      # - name: Build and push client-base
-      #   uses: docker/build-push-action@v5
-      #   with:
-      #     context: client-base
-      #     push: ${{ github.event_name == 'push' && github.repository == 'DIRACGrid/container-images' && github.ref_name == 'main' }}
-      #     tags: ghcr.io/diracgrid/diracx/client-base:latest
-      #     platforms: linux/amd64,linux/arm64
-      #     build-args: BASE_IMAGE_DIGEST=${{steps.build_base.outputs.digest}}
+      - name: Build client-base
+        uses: docker/build-push-action@v5
+        with:
+          context: client-base
+          build-contexts: |
+            diracx/base=oci-layout://output-base@${{steps.build_base.outputs.digest}}
+          outputs: type=oci,dest=output-client-base.tar
+          tags: ghcr.io/diracgrid/diracx/client-base:latest
+          platforms: linux/amd64,linux/arm64
+      - name: Extract client-base
+        run: |
+          mkdir output-client-base
+          tar -C output-client-base -xf output-client-base.tar
diff --git a/client-base/Dockerfile b/client-base/Dockerfile
@@ -1,5 +1,4 @@
-ARG BASE_IMAGE_DIGEST=blabla
-FROM ghcr.io/diracgrid/diracx/base@${BASE_IMAGE_DIGEST}
+FROM ghcr.io/diracgrid/diracx/base
 
 
 # Copying in ENTRYPOINT script and environment specification

diff --git a/services-base/Dockerfile b/services-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM foo
+FROM ghcr.io/diracgrid/diracx/base
 
 
 # Copying in ENTRYPOINT script and environment specification