revert change on build-test-upload

superstar54 · Mar 21, 2024 · 4043ae4 · 4043ae4
1 parent a4f6806
commit 4043ae4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/docker-build-test-upload.yml b/.github/workflows/docker-build-test-upload.yml
@@ -23,9 +23,6 @@ on:
 jobs:
     build-test-upload:
         runs-on: ${{ inputs.runsOn }}
-        strategy:
-            matrix:
-                aiida-core-version: [2.3, 2.4.3]
         continue-on-error: true
 
         steps:
@@ -50,8 +47,7 @@ jobs:
 
             - name: Build image 🛠
               working-directory: docker
-              run: docker buildx bake --set *.BASE_IMAGE=aiida-${{ matrix.aiida-core-version }} --set qe.platform=linux/${{ inputs.architecture }} -f docker-bake.hcl
-                  -f build.json --load
+              run: docker buildx bake --set qe.platform=linux/${{ inputs.architecture }} -f docker-bake.hcl -f build.json --load
               env:
                   # Use buildx
                   DOCKER_BUILDKIT: 1
@@ -68,15 +64,14 @@ jobs:
             - name: Save image as a tar for later use 💾
               run: |
                   mkdir -p /tmp/aiidalab/
-                  docker save ${{ env.OWNER }}/${{ inputs.image }} -o /tmp/aiidalab/${{ inputs.image }}-${{ inputs.architecture }}-${{ matrix.aiida-core-version }}.tar
+                  docker save ${{ env.OWNER }}/${{ inputs.image }} -o /tmp/aiidalab/${{ inputs.image }}-${{ inputs.architecture }}.tar
               shell: bash
               if: always()
 
             - name: Upload image as artifact 💾
               uses: actions/upload-artifact@v4
               with:
-                  # Include aiida-core-version in the artifact name
-                  name: ${{ inputs.image }}-${{ inputs.architecture }}-${{ matrix.aiida-core-version }}
+                  name: ${{ inputs.image }}-${{ inputs.architecture }}
                   path: /tmp/aiidalab/${{ inputs.image }}-${{ inputs.architecture }}.tar
                   retention-days: 3
               if: always()
diff --git a/docker/build.json b/docker/build.json
@@ -1,5 +1,8 @@
 {
   "variable": {
+    "AIIDALAB_BASE_IMAGE": {
+      "default": "aiidalab/full-stack:latest"
+    },
     "QE_VERSION": {
       "default": "7.2"
     }