Skip to content

Commit 0693de9

Browse files
ci: replace individual github workflows with matrix-build for dockerfiles
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
1 parent d5a30e7 commit 0693de9

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -424,9 +424,9 @@ docker_build:
424424
--build-arg USER="$(USER)" \
425425
--build-arg USER_ID="$(USER_ID)" \
426426
--build-arg WHOAMI="$(SYS_USER)" \
427-
--cache-from type=local,src=$(DOCKER_BUILD_CACHE_DIR) \
428-
--cache-from type=image,ref=$(DOCKER_CACHE_REPO) \
429-
--cache-to type=local,dest=$(DOCKER_BUILD_CACHE_DIR),mode=max \
427+
# --cache-from type=local,src=$(DOCKER_BUILD_CACHE_DIR) \
428+
--cache-from type=registry,ref=$(DOCKER_CACHE_REPO) \
429+
# --cache-to type=local,dest=$(DOCKER_BUILD_CACHE_DIR),mode=max \
430430
--label org.opencontainers.image.revision="$(GITHUB_SHA)" \
431431
--label org.opencontainers.image.source="$(GITHUB_URL)" \
432432
--label org.opencontainers.image.title="$(USER)/$(NAME)" \
@@ -435,13 +435,13 @@ docker_build:
435435
--memory $(DOCKER_MEMORY_LIMIT) \
436436
--memory-swap $(DOCKER_MEMORY_LIMIT) \
437437
--network=host \
438-
--output type=image,oci-mediatypes=true,compression=zstd,compression-level=5,force-compression=true,push=$(DOCKER_PUSH) \
438+
--output type=registry,oci-mediatypes=true,compression=zstd,compression-level=5,force-compression=true,push=$(DOCKER_PUSH) \
439439
--provenance=mode=max \
440440
--secret id=gat,src="$(TMP_DIR)/gat" \
441441
-t "$(USER)/$(NAME):$(DOCKER_TAG_VERSION)" \
442442
-t "ghcr.io/$(GHCR_USER)/$(NAME):$(DOCKER_TAG_VERSION)" \
443-
-f $(DOCKERFILE) .
444-
# --cache-to type=image,ref=$(DOCKER_CACHE_REPO),mode=max,inline=true \
443+
-f $(DOCKERFILE) . \
444+
--cache-to type=registry,ref=$(DOCKER_CACHE_REPO),mode=max,inline=true
445445
docker buildx rm --force "$(DOCKER_BUILDER_NAME)"
446446
@rm -rf $(TMP_DIR)
447447

0 commit comments

Comments
 (0)