Change to OCI on build export tarball

radareorg · Apr 17, 2024 · 2c9d8e7 · 2c9d8e7
1 parent c05d7bf
commit 2c9d8e7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -47,6 +47,6 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: docker-${{ matrix.arch }}
-          path: docker-images/radare2-docker-*.tar
+          path: docker-images/radare2-docker-*.tar*
           if-no-files-found: error
-          compression-level: 9
+          compression-level: 0
diff --git a/Makefile b/Makefile
@@ -66,13 +66,15 @@ docker-buildx:
 		--tag "$(DOCKER_IMAGE)" \
 		docker
 
-# Build crossplatform docker locally for testing
+# Build crossplatform docker as tarball
 docker-buildx-tarball:
 	mkdir -p docker-images
-	docker buildx build $(DOCKER_BUILD_ARGS) $(DOCKER_LABELS) \
+	docker buildx build $(DOCKER_BUILD_ARGS) $(DOCKER_LABELS) $(DOCKER_ANNOTATIONS_MANIFEST) $(DOCKER_ANNOTATIONS_INDEX) \
 		--target docker \
 		--platform "$(TARGETPLATFORM)" \
-		--output "type=docker,dest=docker-images/radare2-docker-$(SNAP_ARCH).tar" \
+		--attest type=sbom,generator=docker/buildkit-syft-scanner \
+		--attest type=provenance \
+		--output "type=oci,compression=zstd,dest=docker-images/radare2-docker-$(SNAP_ARCH).tar.zstd" \
 		--tag "$(DOCKER_IMAGE)" \
 		docker