import quincy 17.2.0

[ceph.git] / ceph / monitoring / grafana / build / Makefile

diff --git a/ceph/monitoring/grafana/build/Makefile b/ceph/monitoring/grafana/build/Makefile
index ace8dec3a2e1c925597de7193077d9e83d5c253c..64f61999026c8406a41ca97be2c21450f683a91f 100755 (executable)
--- a/ceph/monitoring/grafana/build/Makefile
+++ b/ceph/monitoring/grafana/build/Makefile
@@ -1,10 +1,10 @@
 
-GRAFANA_VERSION ?= 6.7.4-1
-PIECHART_VERSION ?= "1.6.1"
-STATUS_PANEL_VERSION ?= "1.0.9"
+GRAFANA_VERSION ?= 8.3.5-1
+PIECHART_VERSION ?= "1.6.2"
+STATUS_PANEL_VERSION ?= "1.0.11"
 DASHBOARD_DIR := "../../ceph-mixin/dashboards_out"
 DASHBOARD_PROVISIONING := "ceph-dashboard.yml"
-IMAGE := "docker.io/centos:8"
+IMAGE := "docker.io/redhat/ubi8:8.5"
 PKGMGR := "dnf"
 GF_CONFIG := "/etc/grafana/grafana.ini"
 # clip off "-<whatever> from the end of GRAFANA_VERSION
@@ -72,25 +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
        rm -f ${DASHBOARD_PROVISIONING}