docker: save SPDK target arch as label

Signed-off-by: Ernesto Puerta <[email protected]>
ceph · Jan 22, 2024 · 4d50f7e · 4d50f7e
1 parent c342a01
commit 4d50f7e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -45,20 +45,16 @@ jobs:
       - name: Save container images
         run: |
           . .env
-          docker save $QUAY_NVMEOF:$NVMEOF_VERSION > nvmeof.tar
-          docker save $QUAY_NVMEOFCLI:$NVMEOF_VERSION > nvmeof-cli.tar
-          docker save $QUAY_CEPH:$CEPH_VERSION  > vstart-cluster.tar
-          docker save bdevperf > bdevperf.tar
+          docker save $QUAY_NVMEOF:$NVMEOF_VERSION -o nvmeof.tar.xz
+          docker save $QUAY_NVMEOFCLI:$NVMEOF_VERSION -o nvmeof-cli.tar.xz
+          docker save $QUAY_CEPH:$CEPH_VERSION -o ceph.tar.xz
+          docker save bdevperf -o bdevperf.tar.xz
 
       - name: Upload container images
         uses: actions/upload-artifact@v3
         with:
           name: ceph_nvmeof_container_images-${{ github.run_number }}
-          path: |
-            nvmeof.tar
-            nvmeof-cli.tar
-            vstart-cluster.tar
-            bdevperf.tar
+          path: "*.tar.xz"
 
   pytest:
     needs: build
@@ -84,8 +80,7 @@ jobs:
 
       - name: Load container images
         run: |
-          docker load < nvmeof.tar
-          docker load < vstart-cluster.tar
+          docker load -i *.tar.xz
 
       - name: Clear space on disk
         run: |
@@ -191,10 +186,7 @@ jobs:
 
       - name: Load container images
         run: |
-          docker load < nvmeof.tar
-          docker load < nvmeof-cli.tar
-          docker load < vstart-cluster.tar
-          docker load < bdevperf.tar
+          docker load -i *.tar.xz
 
       - name: Start containers
         run: |
@@ -324,10 +316,7 @@ jobs:
 
       - name: Load container images
         run: |
-          docker load < nvmeof.tar
-          docker load < nvmeof-cli.tar
-          docker load < vstart-cluster.tar
-          docker load < bdevperf.tar
+          docker load -i +.tar.xz
 
       - name: Start discovery controller
         if: matrix.integration == 'container'
@@ -500,8 +489,7 @@ jobs:
 
       - name: Load container images
         run: |
-          docker load < nvmeof.tar
-          docker load < nvmeof-cli.tar
+          docker load -i *.tar.xz
 
       - name: Login to quay.io
         uses: docker/login-action@v2

diff --git a/Dockerfile.spdk b/Dockerfile.spdk
@@ -134,6 +134,7 @@ LABEL io.spdk.version="$SPDK_VERSION" \
       io.spdk.build.pkgdep-args="$SPDK_PKGDEP_ARGS" \
       io.spdk.build.configure-args="$SPDK_CONFIGURE_ARGS" \
       io.spdk.build.makeflags="$SPDK_MAKEFLAGS" \
+      io.spdk.build.target-arch="$SPDK_TARGET_ARCH" \
       io.spdk.build.ceph-release="$SPDK_CEPH_VERSION" \
       io.spdk.git.repo="$SPDK_GIT_REPO" \
       io.spdk.git.branch="$SPDK_GIT_BRANCH" \

diff --git a/mk/containerized.mk b/mk/containerized.mk
@@ -65,6 +65,10 @@ down: override OPTS += --volumes --remove-orphans
 
 events: ## Receive real-time events from containers
 
+.PHONY:
+image_name:
+	@$(DOCKER_COMPOSE) config --format=json | jq '.services."$(SVC)".image'
+
 .PHONY:
 docker_compose_clean: down
 	$(DOCKER) system prune --all --force --volumes --filter label="io.ceph.nvmeof"