]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
grafana/Makefile: don't push to docker 45739/head
authorErnesto Puerta <epuertat@redhat.com>
Thu, 31 Mar 2022 18:29:17 +0000 (20:29 +0200)
committerErnesto Puerta <epuertat@redhat.com>
Fri, 1 Apr 2022 09:44:43 +0000 (11:44 +0200)
Fixes: https://tracker.ceph.com/issues/55155
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
monitoring/grafana/build/Makefile

index 92c64ac78d038c1d61e71e5d9a1cf3baf199ae76..4e2854efa3676266dbba5df54fe8ff07b51aaa71 100755 (executable)
@@ -1,5 +1,5 @@
 
-GRAFANA_VERSION ?= 8.2.6-1
+GRAFANA_VERSION ?= 8.3.5
 PIECHART_VERSION ?= "1.6.1"
 STATUS_PANEL_VERSION ?= "1.0.9"
 DASHBOARD_DIR := "../../ceph-mixin/dashboards_out"
@@ -72,17 +72,13 @@ providers: \\n\
        sudo buildah commit --format docker --squash $(CONTAINER) $(LOCALTAG)
 
 push:
-       sudo podman tag ${LOCALTAG} docker.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
        rm -f grafana-*.rpm* auth.json
        rm -f ${DASHBOARD_PROVISIONING}