docker: Make additional plugins available

Manually verified by running a command like this. $ docker run -e GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=grafana-bigquery-datasource,sysdig -e GF_PATHS_PLUGINS=/usr/share/grafana/plugins
goldmansachs · Feb 9, 2025 · e617466 · e617466
1 parent 4cee7a9
commit e617466
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/Dockerfile.ubi8 b/Dockerfile.ubi8
@@ -100,16 +100,7 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \
 WORKDIR $GF_PATHS_HOME
 USER root
 
-RUN microdnf upgrade --refresh -y && microdnf install shadow-utils wget tar gzip
-
-# setup plugins dir
-RUN mkdir -p plugins/
-
-# sysdig plugin
-RUN mkdir -p plugins/sysdig/
-RUN wget "https://download.sysdig.com/stable/grafana-sysdig-datasource/grafana-sysdig-datasource-v0.8.tgz"
-RUN tar -xvf grafana-sysdig-datasource-v0.8.tgz
-RUN mv -f sysdig/* plugins/sysdig && rm -r /usr/share/grafana/grafana-sysdig-datasource-v0.8.tgz && rm -r /usr/share/grafana/sysdig
+RUN microdnf upgrade --refresh -y && microdnf install shadow-utils
 
 COPY --from=go-src /tmp/grafana/conf ./conf
 
@@ -134,6 +125,13 @@ COPY --from=go-src /tmp/grafana/bin/grafana* /tmp/grafana/bin/*/grafana* ./bin/
 COPY --from=js-src /tmp/grafana/public ./public
 COPY --from=go-src /tmp/grafana/LICENSE ./
 
+# Additional plugins
+RUN mkdir -p plugins
+RUN grafana cli --pluginsDir ./plugins --pluginUrl https://download.sysdig.com/stable/grafana-sysdig-datasource/grafana-sysdig-datasource-v0.11.zip plugins install grafana-sysdig-datasource
+RUN grafana cli --pluginsDir ./plugins --pluginUrl https://github.com/goldmansachs/bigquery-grafana-plugin/releases/download/gs_v1.9.2/grafana-bigquery-datasource-1.9.2.zip plugins install grafana-bigquery-datasource
+RUN grafana cli --pluginsDir ./plugins plugins install michaeldmoore-multistat-panel
+RUN grafana cli --pluginsDir ./plugins plugins install marcusolsson-dynamictext-panel
+
 USER grafana
 RUN grafana cli plugins install neocat-cal-heatmap-panel 0.0.4
 

diff --git a/Makefile b/Makefile
@@ -355,7 +355,7 @@ dist:
 	tar -czf public/build/static/source_$(shell git rev-parse HEAD).tar.gz grafana-dist/
 
 build_from_dist: dist
-	./build.sh public/build/static/source_$(shell git rev-parse HEAD).tar.gz 10-ubi8-10.3.12-3
+	./build.sh public/build/static/source_$(shell git rev-parse HEAD).tar.gz 10-ubi8-10.3.12-4
 
 push_from_dist: build_from_dist
-	docker push ghcr.io/goldmansachs/grafana:10-ubi8-10.3.12-3
+	docker push ghcr.io/goldmansachs/grafana:10-ubi8-10.3.12-4