From: Dan Mick Date: Wed, 28 Apr 2021 03:01:36 +0000 (-0700) Subject: monitoring/grafana/build/Makefile: Add ARCH variable X-Git-Tag: v17.1.0~1764^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=444d6f6623a4375acd8b91f9b9dfcf2239045e5a;p=ceph.git monitoring/grafana/build/Makefile: Add ARCH variable Allow building for other archs, in particular arm64 Signed-off-by: Dan Mick --- diff --git a/monitoring/grafana/build/Makefile b/monitoring/grafana/build/Makefile index 6c5ae1364d97..71e25a36b6f8 100755 --- a/monitoring/grafana/build/Makefile +++ b/monitoring/grafana/build/Makefile @@ -11,17 +11,20 @@ PKGMGR := "dnf" GF_CONFIG := "/etc/grafana/grafana.ini" ceph_version := "master" +ARCH ?= x86_64 +ifeq "$(ARCH)" "arm64" + override ARCH := aarch64 +endif + # Build a grafana instance - preconfigured for use within Ceph's dashboard UI build : fetch_dashboards echo "Creating base container" $(eval CONTAINER := $(shell buildah from ${IMAGE})) # Using upstream grafana build - wget https://dl.grafana.com/oss/release/grafana-${GRAFANA_VERSION}.x86_64.rpm - #wget localhost:8000/grafana-${GRAFANA_VERSION}.x86_64.rpm - #cp grafana-${GRAFANA_VERSION}.x86_64.rpm ${mountpoint}/tmp/. - buildah copy $(CONTAINER) grafana-${GRAFANA_VERSION}.x86_64.rpm /tmp/grafana-${GRAFANA_VERSION}.x86_64.rpm - buildah run $(CONTAINER) ${PKGMGR} install -y --setopt install_weak_deps=false --setopt=tsflags=nodocs /tmp/grafana-${GRAFANA_VERSION}.x86_64.rpm + wget https://dl.grafana.com/oss/release/grafana-${GRAFANA_VERSION}.${ARCH}.rpm + buildah copy $(CONTAINER) grafana-${GRAFANA_VERSION}.${ARCH}.rpm /tmp/grafana-${GRAFANA_VERSION}.${ARCH}.rpm + buildah run $(CONTAINER) ${PKGMGR} install -y --setopt install_weak_deps=false --setopt=tsflags=nodocs /tmp/grafana-${GRAFANA_VERSION}.${ARCH}.rpm buildah run $(CONTAINER) ${PKGMGR} clean all buildah run $(CONTAINER) rm -f /tmp/grafana*.rpm buildah run $(CONTAINER) grafana-cli plugins install grafana-piechart-panel ${PIECHART_VERSION}