@@ -12,19 +12,21 @@ ENV GOFLAGS="-mod=vendor"
12
12
RUN go run -mod vendor build.go -dev build
13
13
14
14
# Build stage 2
15
- FROM registry.redhat.io/ubi9 /ubi-minimal :latest
15
+ FROM registry.redhat.io/ubi8 /ubi:latest
16
16
17
17
# Update the image to get the latest CVE updates
18
- RUN microdnf update -y
18
+ RUN yum update -y --setopt=install_weak_deps=False
19
19
20
20
ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
21
21
GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
22
22
GF_PATHS_DATA="/var/lib/grafana" \
23
23
GF_PATHS_HOME="/usr/share/grafana" \
24
24
GF_PATHS_LOGS="/var/log/grafana" \
25
- GF_PATHS_PLUGINS="/usr/share/grafana/plugins" \
26
- GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
25
+ GF_PATHS_PLUGINS="/usr/share/grafana/plugins-bundled" \
26
+ GF_PATHS_PROVISIONING="/etc/grafana/provisioning" \
27
+ GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS="grafana-piechart-panel vonage-status-panel"
27
28
29
+ COPY plugins.tar /plugins.tar
28
30
RUN rm -rf $GF_PATHS_HOME && mkdir -p $GF_PATHS_HOME
29
31
COPY --from=builder go/grafana/bin/grafana /usr/bin/grafana
30
32
COPY --from=builder go/grafana/bin/grafana-server /usr/bin/grafana-server
@@ -40,10 +42,16 @@ COPY --from=builder go/grafana/conf/ldap.toml /etc/grafana/ldap.toml
40
42
COPY ./run.sh /run.sh
41
43
42
44
# Create grafana user/group
43
- RUN microdnf install -y shadow-utils
45
+ RUN dnf install -y shadow-utils
44
46
RUN groupadd -r -g 472 grafana
45
47
RUN useradd -r -u 472 -g grafana -d /etc/grafana -s /sbin/nologin -c "Grafana Dashboard" grafana
46
48
49
+ # Install grafana dashboards from Ceph
50
+ RUN dnf install -y ceph-grafana-dashboards
51
+
52
+ # Copy ceph-dashboard yaml
53
+ COPY ceph-dashboard.yml "$GF_PATHS_PROVISIONING/dashboards/"
54
+
47
55
# Unpack plugins and update permissions
48
56
RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
49
57
mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
@@ -55,6 +63,7 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
55
63
"$GF_PATHS_LOGS" \
56
64
"$GF_PATHS_PLUGINS" \
57
65
"$GF_PATHS_DATA" && \
66
+ tar -C "$GF_PATHS_PLUGINS" -xvf /plugins.tar && \
58
67
chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
59
68
chmod -R 775 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" /run.sh
60
69
@@ -67,9 +76,9 @@ ENTRYPOINT [ "/run.sh" ]
67
76
# Build specific labels
68
77
LABEL maintainer=
"Nizamudeen A <[email protected] >"
69
78
LABEL com.redhat.component="grafana-container"
70
- LABEL version=11.5.2
79
+ LABEL version=5
71
80
LABEL name="grafana"
72
- LABEL description="Red Hat Ceph Storage Grafana container"
73
- LABEL summary="Grafana container on RHEL 9 for Red Hat Ceph Storage"
74
- LABEL io.k8s.display-name="Grafana on RHEL 9 "
81
+ LABEL description="Red Hat Ceph Storage 5 Grafana container"
82
+ LABEL summary="Provides the Grafana container on RHEL 8 for Red Hat Ceph Storage 5. "
83
+ LABEL io.k8s.display-name="Grafana on RHEL 8 "
75
84
LABEL io.openshift.tags="rhceph ceph dashboard grafana"
0 commit comments