IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -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
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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"