Skip to content

Commit

Permalink
Merge branch 'update-buildmk' into 'master'
Browse files Browse the repository at this point in the history
Update build.mk to 1987be57d988f5062d462ef6e4ed3d3e88877694

See merge request ModioAB/housekeeper!37
  • Loading branch information
Spindel committed May 12, 2021
2 parents 427cb97 + 6ad8d2c commit 0cb541c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ _log_cmd_image_publish = PUBLISH $(IMAGE_TAG)


define _cmd_image_podman_temp-publish =
$(_podman) push docker://$(IMAGE_LOCAL_TAG) && \
$(_podman) push $(IMAGE_LOCAL_TAG) docker://$(IMAGE_LOCAL_TAG) && \
$(_podman) rmi $(IMAGE_LOCAL_TAG)
endef
define _cmd_image_docker_temp-publish =
Expand Down Expand Up @@ -574,6 +574,7 @@ build-publish: $(IMAGE_DOCKERFILE) $(IMAGE_FILES)

temp-publish: $(IMAGE_DOCKERFILE) $(IMAGE_FILES)
$(call _cmd_image,build)
$(call _cmd_image,test)
$(call _cmd_image,temp-publish)

# Save the existing image to a tar archive. Remove any existing
Expand Down

0 comments on commit 0cb541c

Please sign in to comment.