Skip to content

Commit 8c2a20a

Browse files
andrewschoenbigjust
authored andcommitted
Dockerfile: use grafana from a submodule
Signed-off-by: Andrew Schoen <[email protected]>
1 parent 258e880 commit 8c2a20a

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

Dockerfile

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Build stage 1
22

3-
FROM brew.registry.redhat.io/rh-osbs/openshift/golang-builder:rhel_9_golang_1.23 AS builder
3+
#FROM brew.registry.redhat.io/rh-osbs/openshift/golang-builder:rhel_9_golang_1.23 AS builder
4+
FROM quay.io/projectquay/golang:1.23 AS builder
45

5-
COPY $REMOTE_SOURCE $REMOTE_SOURCE_DIR
6+
COPY grafana grafana
67

7-
WORKDIR $REMOTE_SOURCE_DIR/app
8+
WORKDIR grafana
89

910
ENV GOFLAGS="-mod=vendor"
1011

@@ -25,17 +26,17 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
2526
GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
2627

2728
RUN rm -rf $GF_PATHS_HOME && mkdir -p $GF_PATHS_HOME
28-
COPY --from=builder $REMOTE_SOURCE_DIR/app/bin/grafana /usr/bin/grafana
29-
COPY --from=builder $REMOTE_SOURCE_DIR/app/bin/grafana-server /usr/bin/grafana-server
30-
COPY --from=builder $REMOTE_SOURCE_DIR/app/bin/grafana-cli /usr/bin/grafana-cli
31-
COPY --from=builder $REMOTE_SOURCE_DIR/app/conf $GF_PATHS_HOME/conf/
32-
COPY --from=builder $REMOTE_SOURCE_DIR/app/docs $GF_PATHS_HOME/docs/
33-
COPY --from=builder $REMOTE_SOURCE_DIR/app/public $GF_PATHS_HOME/public/
34-
COPY --from=builder $REMOTE_SOURCE_DIR/app/scripts $GF_PATHS_HOME/scripts/
29+
COPY --from=builder go/grafana/bin/grafana /usr/bin/grafana
30+
COPY --from=builder go/grafana/bin/grafana-server /usr/bin/grafana-server
31+
COPY --from=builder go/grafana/bin/grafana-cli /usr/bin/grafana-cli
32+
COPY --from=builder go/grafana/conf $GF_PATHS_HOME/conf/
33+
COPY --from=builder go/grafana/docs $GF_PATHS_HOME/docs/
34+
COPY --from=builder go/grafana/public $GF_PATHS_HOME/public/
35+
COPY --from=builder go/grafana/scripts $GF_PATHS_HOME/scripts/
3536

3637
RUN rm -rf /etc/grafana && mkdir -p /etc/grafana
37-
COPY --from=builder $REMOTE_SOURCE_DIR/app/conf/sample.ini $GF_PATHS_CONFIG
38-
COPY --from=builder $REMOTE_SOURCE_DIR/app/conf/ldap.toml /etc/grafana/ldap.toml
38+
COPY --from=builder go/grafana/conf/sample.ini $GF_PATHS_CONFIG
39+
COPY --from=builder go/grafana/conf/ldap.toml /etc/grafana/ldap.toml
3940
COPY ./run.sh /run.sh
4041

4142
# Create grafana user/group

0 commit comments

Comments
 (0)