root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 142 Packages Projects Releases Wiki Activity

build: fixes png rendering in the docker based docker-image build.

This commit is contained in:
Leonard Gram 2018-08-07 16:11:37 +02:00
parent 8d0a100b94
commit d48f1f57f0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Dockerfile
View File

@ -13,8 +13,10 @@ RUN if [ ! -z "${DEP_ENSURE}" ]; then \
fi fi
COPY pkg pkg COPY pkg pkg
RUN go install -ldflags="-s -w" ./pkg/cmd/grafana-server && \ COPY build.go build.go
go install -ldflags="-s -w" ./pkg/cmd/grafana-cli COPY package.json package.json
RUN go run build.go build
# Node build container # Node build container
FROM node:8 FROM node:8
@ -22,7 +24,7 @@ FROM node:8
WORKDIR /usr/src/app/ WORKDIR /usr/src/app/
COPY package.json yarn.lock ./ COPY package.json yarn.lock ./
RUN yarn install --frozen-lockfile RUN yarn install --pure-lockfile --no-progress
COPY Gruntfile.js tsconfig.json tslint.json ./ COPY Gruntfile.js tsconfig.json tslint.json ./
COPY public public COPY public public
@ -30,7 +32,7 @@ COPY scripts scripts
COPY emails emails COPY emails emails
ENV NODE_ENV production ENV NODE_ENV production
RUN yarn run build RUN ./node_modules/.bin/grunt build
# Final container # Final container
FROM debian:stretch-slim FROM debian:stretch-slim
@ -48,6 +50,10 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
WORKDIR $GF_PATHS_HOME WORKDIR $GF_PATHS_HOME
RUN apt-get update && apt-get install -qq -y libfontconfig ca-certificates && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*
COPY conf ./conf COPY conf ./conf
RUN mkdir -p "$GF_PATHS_HOME/.aws" && \ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
@ -63,13 +69,14 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" && \ chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" && \
chmod 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" chmod 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS"
COPY --from=0 /go/bin/grafana-server /go/bin/grafana-cli ./bin/ COPY --from=0 /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-server /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-cli ./bin/
COPY --from=1 /usr/src/app/public ./public COPY --from=1 /usr/src/app/public ./public
COPY --from=1 /usr/src/app/tools ./tools COPY --from=1 /usr/src/app/tools ./tools
COPY tools/phantomjs/render.js ./tools/phantomjs/render.js
EXPOSE 3000 EXPOSE 3000
COPY ./scripts/docker/run.sh /run.sh COPY ./packaging/docker/run.sh /run.sh
USER grafana USER grafana
ENTRYPOINT [ "/run.sh" ] ENTRYPOINT [ "/run.sh" ]

3
packaging/docker/Dockerfile
View File

@ -23,6 +23,8 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
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
RUN apt-get update && apt-get install -qq -y libfontconfig ca-certificates && \ RUN apt-get update && apt-get install -qq -y libfontconfig ca-certificates && \
apt-get autoremove -y && \ apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
@ -47,5 +49,4 @@ EXPOSE 3000
COPY ./run.sh /run.sh COPY ./run.sh /run.sh
USER grafana USER grafana
WORKDIR /
ENTRYPOINT [ "/run.sh" ] ENTRYPOINT [ "/run.sh" ]