Skip to content

Commit bc7273f

Browse files
Rakshitha-Kamathrakshithakamath94
authored andcommitted
This PR does the following
[1] Podman buildx platform support for SPS Dockerfile [2] Fix the path issues with both the Dockerfiles Signed-off-by: Rakshitha-Kamath <[email protected]>
1 parent 5811b0b commit bc7273f

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
2727
GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
2828

2929
RUN rm -rf $GF_PATHS_HOME && mkdir -p $GF_PATHS_HOME
30-
COPY --from=builder /grafana/pkg/cmd/grafana /usr/bin/grafana
31-
COPY --from=builder /grafana/pkg/cmd/grafana-server /usr/bin/grafana-server
32-
COPY --from=builder /grafana/pkg/cmd/grafana-cli /usr/bin/grafana-cli
30+
COPY --from=builder /grafana/bin/grafana /usr/bin/grafana
31+
COPY --from=builder /grafana/bin/grafana-server /usr/bin/grafana-server
32+
COPY --from=builder /grafana/bin/grafana-cli /usr/bin/grafana-cli
3333
COPY --from=builder /grafana/conf $GF_PATHS_HOME/conf/
3434
COPY --from=builder /grafana/docs $GF_PATHS_HOME/docs/
3535
COPY --from=builder /grafana/public $GF_PATHS_HOME/public/
@@ -41,7 +41,7 @@ COPY --from=builder /grafana/conf/ldap.toml /etc/grafana/ldap.toml
4141
COPY ./run.sh /run.sh
4242

4343
# Create grafana user/group
44-
#RUN microdnf install -y shadow-utils
44+
RUN microdnf install -y shadow-utils
4545
RUN groupadd -r -g 472 grafana
4646
RUN useradd -r -u 472 -g grafana -d /etc/grafana -s /sbin/nologin -c "Grafana Dashboard" grafana
4747

@@ -75,5 +75,5 @@ LABEL summary="Grafana container on RHEL 9 for Red Hat Ceph Storage"
7575
LABEL io.k8s.display-name="Grafana on RHEL 9"
7676
LABEL io.k8s.description="grafana-container"
7777
LABEL io.openshift.tags="rhceph ceph dashboard grafana"
78-
LABEL cpe=cpe:/a:redhat:ceph_storage:9::el9
78+
LABEL cpe=cpe:/a:redhat:ceph_storage:8::el9
7979
LABEL org.opencontainers.image.created="${BUILD_DATE}"

Dockerfile_IBM

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
3131
GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
3232

3333
RUN rm -rf $GF_PATHS_HOME && mkdir -p $GF_PATHS_HOME
34-
COPY --from=builder $REMOTE_SOURCE_DIR/grafana/pkg/cmd/grafana /usr/bin/grafana
35-
COPY --from=builder $REMOTE_SOURCE_DIR/grafana/pkg/cmd/grafana-server /usr/bin/grafana-server
36-
COPY --from=builder $REMOTE_SOURCE_DIR/grafana/pkg/cmd/grafana-cli /usr/bin/grafana-cli
34+
COPY --from=builder $REMOTE_SOURCE_DIR/grafana/bin/grafana /usr/bin/grafana
35+
COPY --from=builder $REMOTE_SOURCE_DIR/grafana/bin/grafana-server /usr/bin/grafana-server
36+
COPY --from=builder $REMOTE_SOURCE_DIR/grafana/bin/grafana-cli /usr/bin/grafana-cli
3737
COPY --from=builder $REMOTE_SOURCE_DIR/grafana/conf $GF_PATHS_HOME/conf/
3838
COPY --from=builder $REMOTE_SOURCE_DIR/grafana/docs $GF_PATHS_HOME/docs/
3939
COPY --from=builder $REMOTE_SOURCE_DIR/grafana/public $GF_PATHS_HOME/public/
@@ -78,5 +78,5 @@ LABEL summary="Grafana container on RHEL 9 for Red Hat Ceph Storage"
7878
LABEL io.k8s.display-name="Grafana on RHEL 9"
7979
LABEL io.k8s.description="grafana-container"
8080
LABEL io.openshift.tags="rhceph ceph dashboard grafana"
81-
LABEL cpe=cpe:/a:redhat:ceph_storage:9::el9
81+
LABEL cpe=cpe:/a:redhat:ceph_storage:8::el9
8282
LABEL org.opencontainers.image.created="${BUILD_DATE}"

0 commit comments

Comments
 (0)