IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-25 16:31:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Docker: Upgrade to base on Alpine 3.12 (#25936)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-06-30 14:26:02 +02:00 committed by GitHub
parent 8e36a15968
commit 463e8ffd92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:12.16.3-alpine3.11 as js-builder
FROM node:12.18.1-alpine3.12 as js-builder
WORKDIR /usr/src/app/
@ -16,7 +16,7 @@ COPY emails emails
ENV NODE_ENV production
RUN ./node_modules/.bin/grunt build
FROM golang:1.14.2-alpine3.11 as go-builder
FROM golang:1.14.4-alpine3.12 as go-builder
RUN apk add --no-cache gcc g++
@ -32,7 +32,7 @@ COPY build.go package.json ./
RUN go run build.go build
# Final stage
FROM alpine:3.11
FROM alpine:3.12
LABEL maintainer="Grafana team <hello@grafana.com>"

2
packaging/docker/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BASE_IMAGE=alpine:3.11
ARG BASE_IMAGE=alpine:3.12
FROM ${BASE_IMAGE}
ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"

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.11"
base_image="${base_arch}alpine:3.12"
else
libc=""
dockerfile="ubuntu.Dockerfile"