@@ -497,12 +497,12 @@ docker/login: docker/login/fleet-manager
497
497
.PHONY : docker/login
498
498
499
499
docker/login/fleet-manager :
500
- @docker logout quay.io
500
+ $( DOCKER ) logout quay.io || true # Swallog podman error if not logged in
501
501
@DOCKER_CONFIG=${DOCKER_CONFIG} $(DOCKER ) login -u " ${QUAY_USER} " --password-stdin <<< " ${QUAY_TOKEN}" quay.io
502
502
.PHONY : docker/login/fleet-manager
503
503
504
504
docker/login/probe :
505
- @docker logout quay.io
505
+ $( DOCKER ) logout quay.io || true # Swallow podman error if not logged in
506
506
@DOCKER_CONFIG=${DOCKER_CONFIG} $(DOCKER ) login -u " ${QUAY_PROBE_USER} " --password-stdin <<< " ${QUAY_PROBE_TOKEN}" quay.io
507
507
.PHONY : docker/login/probe
508
508
@@ -563,7 +563,7 @@ image/push: image/push/fleet-manager image/push/probe
563
563
564
564
image/push/fleet-manager : IMAGE_REF="$(external_image_registry ) /$(image_repository ) :$(image_tag ) "
565
565
image/push/fleet-manager :
566
- DOCKER_CONFIG=${DOCKER_CONFIG} $(DOCKER ) buildx build -t $(IMAGE_REF ) --platform $(IMAGE_PLATFORM ) --push .
566
+ DOCKER_CONFIG=${DOCKER_CONFIG} $(DOCKER ) buildx build -t $(IMAGE_REF ) --platform $(IMAGE_PLATFORM ) --output=type=registry .
567
567
@echo
568
568
@echo " Image was pushed as $( IMAGE_REF) . You might want to"
569
569
@echo " export FLEET_MANAGER_IMAGE=$( IMAGE_REF) "
@@ -579,7 +579,7 @@ image/push/probe: image/build/probe
579
579
# push the image to the OpenShift internal registry
580
580
image/push/internal : IMAGE_TAG ?= $(image_tag )
581
581
image/push/internal : docker/login/internal
582
- $(DOCKER ) buildx build -t " $( shell oc get route default-route -n openshift-image-registry -o jsonpath=" {.spec.host}" ) /$( NAMESPACE) /$( IMAGE_NAME) :$( IMAGE_TAG) " --platform linux/amd64 --push .
582
+ $(DOCKER ) buildx build -t " $( shell oc get route default-route -n openshift-image-registry -o jsonpath=" {.spec.host}" ) /$( NAMESPACE) /$( IMAGE_NAME) :$( IMAGE_TAG) " --platform linux/amd64 --output=type=registry .
583
583
.PHONY : image/push/internal
584
584
585
585
image/build/fleetshard-operator : IMAGE_REF="$(external_image_registry ) /fleetshard-operator:$(image_tag ) "
0 commit comments