Skip to content

Commit a535798

Browse files
andrewschoenbigjust
authored andcommitted
Dockerfile: updates for 5.3
Signed-off-by: Andrew Schoen <[email protected]>
1 parent f5ae0fc commit a535798

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

Dockerfile

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,21 @@ ENV GOFLAGS="-mod=vendor"
1212
RUN go run -mod vendor build.go -dev build
1313

1414
# Build stage 2
15-
FROM registry.redhat.io/ubi9/ubi-minimal:latest
15+
FROM registry.redhat.io/ubi8/ubi:latest
1616

1717
# Update the image to get the latest CVE updates
18-
RUN microdnf update -y
18+
RUN yum update -y --setopt=install_weak_deps=False
1919

2020
ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
2121
GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
2222
GF_PATHS_DATA="/var/lib/grafana" \
2323
GF_PATHS_HOME="/usr/share/grafana" \
2424
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"
2728

29+
COPY plugins.tar /plugins.tar
2830
RUN rm -rf $GF_PATHS_HOME && mkdir -p $GF_PATHS_HOME
2931
COPY --from=builder go/grafana/bin/grafana /usr/bin/grafana
3032
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
4042
COPY ./run.sh /run.sh
4143

4244
# Create grafana user/group
43-
RUN microdnf install -y shadow-utils
45+
RUN dnf install -y shadow-utils
4446
RUN groupadd -r -g 472 grafana
4547
RUN useradd -r -u 472 -g grafana -d /etc/grafana -s /sbin/nologin -c "Grafana Dashboard" grafana
4648

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+
4755
# Unpack plugins and update permissions
4856
RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
4957
mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
@@ -55,6 +63,7 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
5563
"$GF_PATHS_LOGS" \
5664
"$GF_PATHS_PLUGINS" \
5765
"$GF_PATHS_DATA" && \
66+
tar -C "$GF_PATHS_PLUGINS" -xvf /plugins.tar && \
5867
chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
5968
chmod -R 775 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" /run.sh
6069

@@ -67,9 +76,9 @@ ENTRYPOINT [ "/run.sh" ]
6776
# Build specific labels
6877
LABEL maintainer="Nizamudeen A <[email protected]>"
6978
LABEL com.redhat.component="grafana-container"
70-
LABEL version=11.5.2
79+
LABEL version=5
7180
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"
7584
LABEL io.openshift.tags="rhceph ceph dashboard grafana"

0 commit comments

Comments
 (0)