RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45578 from rhcs-dashboard/fix-grafana-build

Browse Source 
mgr/dashboard: remove transition-through-oci image workaround in grafana  build

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
This commit is contained in:
Ernesto Puerta 2022-03-31 19:58:29 +02:00 committed by GitHub
commit 87f494eda0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
monitoring/grafana/build/Makefile
View File

@ -72,15 +72,8 @@ 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} 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
@ -91,6 +84,5 @@ 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}