From a80956e592c768aeb395a7d4c3bf6363f6e4ea61 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 24 May 2023 13:51:41 -0700
Subject: [PATCH] Revert "Pull grafyaml from quay.io"
This reverts commit f4d4714ceeb041552a37cfaada7b9d3f95081cbd.
OpenDev is moving back to docker.io to preserve speculative container
image testing.
Depends-On: https://review.opendev.org/c/opendev/grafyaml/+/884291
Change-Id: I6342a19e28d4e3a3f9130c16668d0f4ba2ed7329
---
doc/source/grafana.rst | 2 +-
.../roles/grafana/templates/update-grafana-dashboards.sh.j2 | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/source/grafana.rst b/doc/source/grafana.rst
index 1715d38f69..925ed22019 100644
--- a/doc/source/grafana.rst
+++ b/doc/source/grafana.rst
@@ -81,7 +81,7 @@ load them.
$ docker run --rm -t --network=host \
--env-file ./grafyaml.env \
-v ./project-config/grafana:/grafana:ro \
- quay.io/opendevorg/grafyaml
+ docker.io/opendevorg/grafyaml
To work on dashboards, update the ``yaml`` files in ``project-config``
and re-run the grafyaml import as above, then reload them in the
diff --git a/playbooks/roles/grafana/templates/update-grafana-dashboards.sh.j2 b/playbooks/roles/grafana/templates/update-grafana-dashboards.sh.j2
index e8664ebcf5..fb2adef0bd 100644
--- a/playbooks/roles/grafana/templates/update-grafana-dashboards.sh.j2
+++ b/playbooks/roles/grafana/templates/update-grafana-dashboards.sh.j2
@@ -1,7 +1,7 @@
#!/bin/bash
-docker pull quay.io/opendevorg/grafyaml && \
+docker pull docker.io/opendevorg/grafyaml && \
docker run --rm -t --network=host \
--env-file /etc/grafana/secrets/grafyaml.env \
-v /opt/project-config/grafana:/grafana:ro \
- quay.io/opendevorg/grafyaml
+ docker.io/opendevorg/grafyaml