grafana/Makefile: don't push to docker

Fixes: https://tracker.ceph.com/issues/55155
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 7e6309fac3c4728b3527ab6c709becfb4dcdb126)
(cherry picked from commit cd16e0d070d7b7ed3f2ac7205bb49e3d246de63a)

diff --git a/monitoring/grafana/build/Makefile b/monitoring/grafana/build/Makefile
index c0cda1130a3937e50d8d8d18060d762b145612ac..cf63176c9b4a6dd94c46ea3bdbd23ce582c2f057 100755 (executable)
--- a/monitoring/grafana/build/Makefile
+++ b/monitoring/grafana/build/Makefile
@@ -72,24 +72,13 @@ providers: \\n\
        sudo buildah commit --format docker --squash $(CONTAINER) $(LOCALTAG)
 
 push:
-       # this transition-through-oci image is a workaround for
-       # https://github.com/containers/buildah/issues/3253 and
-       # can be removed when that is fixed and released.  The
-       # --format v2s2 on push is to convert oci back to docker format.
-       sudo podman push $(LOCALTAG) --format=oci dir://tmp/oci-image
-       sudo podman pull dir://tmp/oci-image
-       sudo rm -rf /tmp/oci-image
-       sudo podman tag localhost/tmp/oci-image docker.io/${TAG}
-       sudo podman tag localhost/tmp/oci-image quay.io/${TAG}
+       sudo podman tag ${LOCALTAG} quay.io/${TAG}
        # sudo podman has issues with auth.json; just override it
-       sudo podman login --authfile=auth.json -u ${DOCKER_HUB_USERNAME} -p ${DOCKER_HUB_PASSWORD} docker.io
        sudo podman login --authfile=auth.json -u $(CONTAINER_REPO_USERNAME) -p $(CONTAINER_REPO_PASSWORD) quay.io
-       sudo podman push --authfile=auth.json --format v2s2 docker.io/${TAG}
        sudo podman push --authfile=auth.json --format v2s2 quay.io/${TAG}
 
 clean:
        sudo podman rmi ${LOCALTAG} || true
-       sudo podman rmi docker.io/${TAG} || true
        sudo podman rmi quay.io/${TAG} || true
        sudo podman rmi localhost/tmp/oci-image || true
        rm -f grafana-*.rpm* auth.json