Skip to content

Commit bbdba5e

Browse files
authored
build(container): rebase to centos9-stream (#78)
1 parent e0fce3e commit bbdba5e

File tree

2 files changed

+59
-18
lines changed

2 files changed

+59
-18
lines changed

Dockerfile

Lines changed: 47 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,55 @@
1-
FROM docker.io/grafana/grafana:10.4.3
2-
3-
EXPOSE 3000
4-
5-
RUN grafana cli plugins install yesoreyeram-infinity-datasource
6-
7-
COPY --chown=grafana:root \
8-
dashboards.yaml \
9-
dashboards/*.dashboard.json \
10-
/etc/grafana/provisioning/dashboards/
11-
12-
COPY --chown=grafana:root \
1+
FROM quay.io/centos/centos:stream9-minimal
2+
ARG UID=101
3+
ARG PORT=3000
4+
5+
WORKDIR /usr/share/grafana
6+
ENV VERSION=10
7+
ENV GF_PATHS_HOME=/usr/share/grafana
8+
ENV HOME=/usr/share/grafana
9+
ENV GF_PATHS_PROVISIONING=/etc/grafana/provisioning
10+
ENV GF_PATHS_DATA=/var/lib/grafana
11+
ENV GF_PATHS_LOGS=/var/log/grafana
12+
ENV GF_PATHS_PLUGINS=/var/lib/grafana/plugins
13+
ENV GF_PATHS_CONFIG=/etc/grafana/grafana.ini
14+
15+
LABEL name="cryostat/cryostat-grafana-dashboard" \
16+
version="${VERSION}" \
17+
usage="podman run -d --name grafana -p ${PORT}:${PORT} -v grafana-data:${GF_PATHS_DATA} quay.io/cryostat/cryostat-grafana-dashboard" \
18+
maintainer="Cryostat Maintainers <[email protected]>" \
19+
io.k8s.display-name="Grafana" \
20+
io.openshift.expose-services="3000:grafana" \
21+
io.openshift.tags="grafana,monitoring,dashboard"
22+
23+
RUN useradd -u ${UID} -g 0 -r -d $GF_PATHS_HOME -s /sbin/nologin grafana && \
24+
microdnf upgrade -y && \
25+
microdnf install -y --setopt=tsflags=nodocs grafana && \
26+
microdnf clean all && \
27+
chgrp -R 0 /etc/grafana /var/lib/grafana /var/log/grafana && \
28+
chmod -R g=u /var/lib/grafana /var/log/grafana && \
29+
/usr/sbin/grafana cli plugins install yesoreyeram-infinity-datasource
30+
31+
COPY --chown=grafana:grafana \
32+
dashboards.yaml \
33+
dashboards/*.dashboard.json \
34+
${GF_PATHS_PROVISIONING}/dashboards/
35+
36+
COPY --chown=grafana:grafana \
1337
datasource.yaml \
14-
/etc/grafana/provisioning/datasources/
38+
${GF_PATHS_PROVISIONING}/datasources/
1539

16-
COPY --chown=grafana:root \
40+
COPY --chown=grafana:grafana \
1741
grafana.ini \
18-
/etc/grafana/grafana.ini
42+
${GF_PATHS_CONFIG}
43+
44+
COPY --chown=grafana:grafana \
45+
entrypoint.bash \
46+
/usr/bin/run-grafana
1947

2048
# Listen address of jfr-datasource
2149
ENV JFR_DATASOURCE_URL "http://0.0.0.0:8080"
2250

23-
# User grafana
24-
USER 472
51+
USER ${UID}
52+
53+
EXPOSE ${PORT}
2554

26-
ENTRYPOINT [ "/run.sh" ]
55+
ENTRYPOINT [ "/usr/bin/run-grafana" ]

entrypoint.bash

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
3+
exec /usr/sbin/grafana-server \
4+
--homepath="$GF_PATHS_HOME" \
5+
--config="$GF_PATHS_CONFIG" \
6+
--packaging=docker \
7+
"$@" \
8+
cfg:default.log.mode="console" \
9+
cfg:default.paths.data="$GF_PATHS_DATA" \
10+
cfg:default.paths.logs="$GF_PATHS_LOGS" \
11+
cfg:default.paths.plugins="$GF_PATHS_PLUGINS" \
12+
cfg:default.paths.provisioning="$GF_PATHS_PROVISIONING"

0 commit comments

Comments
 (0)