]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
monitoring/grafana/build/Makefile: Add ARCH variable
authorDan Mick <dmick@redhat.com>
Wed, 28 Apr 2021 03:01:36 +0000 (20:01 -0700)
committerDan Mick <dmick@redhat.com>
Wed, 26 May 2021 20:37:25 +0000 (13:37 -0700)
Allow building for other archs, in particular arm64

Signed-off-by: Dan Mick <dmick@redhat.com>
monitoring/grafana/build/Makefile

index 6c5ae1364d97f617f11566a04479bb3b679c3ec6..71e25a36b6f8d01d7dad39c08d1a6c0af08f55f9 100755 (executable)
@@ -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}