opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 18:12:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for local Makefile to docker (#41296)

Browse Source
This commit is contained in:
Guilherme Caulada
2021-11-04 11:13:10 -03:00
committed by GitHub
parent fb5a65d9be
commit 3cefa0bbba
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -13,7 +13,6 @@ docs
dump.rdb dump.rdb
node_modules node_modules
**/node_modules **/node_modules
/local
/tmp /tmp
*.yml *.yml
!.yarnrc.yml !.yarnrc.yml

45
Dockerfile
View File

@ -27,6 +27,7 @@ RUN apk add --no-cache gcc g++ make
WORKDIR /grafana WORKDIR /grafana
COPY go.mod go.sum embed.go Makefile build.go package.json ./ COPY go.mod go.sum embed.go Makefile build.go package.json ./
COPY ./local/* ./local/
COPY cue cue COPY cue cue
COPY packages/grafana-schema packages/grafana-schema COPY packages/grafana-schema packages/grafana-schema
COPY public/app/plugins public/app/plugins COPY public/app/plugins public/app/plugins
@ -47,12 +48,12 @@ ARG GF_UID="472"
ARG GF_GID="0" ARG GF_GID="0"
ENV PATH="/usr/share/grafana/bin:$PATH" \ ENV PATH="/usr/share/grafana/bin:$PATH" \
GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \ GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
GF_PATHS_DATA="/var/lib/grafana" \ GF_PATHS_DATA="/var/lib/grafana" \
GF_PATHS_HOME="/usr/share/grafana" \ GF_PATHS_HOME="/usr/share/grafana" \
GF_PATHS_LOGS="/var/log/grafana" \ GF_PATHS_LOGS="/var/log/grafana" \
GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \ GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
GF_PATHS_PROVISIONING="/etc/grafana/provisioning" GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
WORKDIR $GF_PATHS_HOME WORKDIR $GF_PATHS_HOME
@ -64,24 +65,24 @@ RUN apk info -vv | sort
COPY conf ./conf COPY conf ./conf
RUN if [ ! $(getent group "$GF_GID") ]; then \ RUN if [ ! $(getent group "$GF_GID") ]; then \
addgroup -S -g $GF_GID grafana; \ addgroup -S -g $GF_GID grafana; \
fi fi
RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \ RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
mkdir -p "$GF_PATHS_HOME/.aws" && \ mkdir -p "$GF_PATHS_HOME/.aws" && \
adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana && \ adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana && \
mkdir -p "$GF_PATHS_PROVISIONING/datasources" \ mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
"$GF_PATHS_PROVISIONING/dashboards" \ "$GF_PATHS_PROVISIONING/dashboards" \
"$GF_PATHS_PROVISIONING/notifiers" \ "$GF_PATHS_PROVISIONING/notifiers" \
"$GF_PATHS_PROVISIONING/plugins" \ "$GF_PATHS_PROVISIONING/plugins" \
"$GF_PATHS_PROVISIONING/access-control" \ "$GF_PATHS_PROVISIONING/access-control" \
"$GF_PATHS_LOGS" \ "$GF_PATHS_LOGS" \
"$GF_PATHS_PLUGINS" \ "$GF_PATHS_PLUGINS" \
"$GF_PATHS_DATA" && \ "$GF_PATHS_DATA" && \
cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \ cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \ cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \ chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
COPY --from=go-builder /grafana/bin/*/grafana-server /go/src/github.com/grafana/grafana/bin/*/grafana-cli ./bin/ COPY --from=go-builder /grafana/bin/*/grafana-server /go/src/github.com/grafana/grafana/bin/*/grafana-cli ./bin/
COPY --from=js-builder /grafana/public ./public COPY --from=js-builder /grafana/public ./public