IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Docker: Upgrade to Alpine 3.11 (#24056)

Browse Source 
* Docker: Upgrade to Alpine 3.11
This commit is contained in:
Arve Knudsen 2020-04-30 13:42:06 +02:00 committed by GitHub
parent 37b1ae32cc
commit dda8caf48c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -1,5 +1,5 @@
# Golang build container
FROM golang:1.14.1-alpine
FROM golang:1.14.2-alpine3.11 as go-builder
RUN apk add --no-cache gcc g++
@ -15,7 +15,7 @@ COPY build.go package.json ./
RUN go run build.go build
# Node build container
FROM node:12.13.0-alpine
FROM node:12.16.3-alpine3.11 as js-builder
WORKDIR /usr/src/app/
@ -34,7 +34,7 @@ ENV NODE_ENV production
RUN ./node_modules/.bin/grunt build
# Final container
FROM alpine:3.10
FROM alpine:3.11
LABEL maintainer="Grafana team <hello@grafana.com>"
@ -52,7 +52,7 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \
WORKDIR $GF_PATHS_HOME
RUN apk add --no-cache ca-certificates bash tzdata && \
apk add --no-cache --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main openssl musl-utils
apk add --no-cache --upgrade openssl musl-utils
COPY conf ./conf
@ -70,9 +70,9 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
chown -R grafana:grafana "$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=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/tools ./tools
COPY --from=go-builder /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=js-builder /usr/src/app/public ./public
COPY --from=js-builder /usr/src/app/tools ./tools
EXPOSE 3000

4
Dockerfile.ubuntu
View File

@ -1,4 +1,4 @@
FROM golang:1.14.1 AS go-builder
FROM golang:1.14.2 AS go-builder
WORKDIR /src/grafana
@ -11,7 +11,7 @@ COPY pkg pkg/
RUN go run build.go build
FROM node:12.13 AS js-builder
FROM node:12.16.3-slim AS js-builder
WORKDIR /usr/src/app/

4
packaging/docker/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BASE_IMAGE=alpine:3.10
ARG BASE_IMAGE=alpine:3.11
FROM ${BASE_IMAGE}
ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"
@ -24,7 +24,7 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
WORKDIR $GF_PATHS_HOME
RUN apk add --no-cache ca-certificates bash tzdata && \
apk add --no-cache --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main openssl musl-utils
apk add --no-cache --upgrade openssl musl-utils
# Oracle Support for x86_64 only
RUN if [ `arch` = "x86_64" ]; then \

2
packaging/docker/build.sh
View File

@ -60,7 +60,7 @@ docker_build () {
if [ $UBUNTU_BASE = "0" ]; then
libc="-musl"
dockerfile="Dockerfile"
base_image="${base_arch}alpine:3.10"
base_image="${base_arch}alpine:3.11"
else
libc=""
dockerfile="ubuntu.Dockerfile"