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

Chore: Update to alpine:3.14.2 (#38813)

Browse Source 
* Update apline to 3.14.2

* Remove libcrypto1.1 libssl1.1 version dependencies

* Update grabpl version
This commit is contained in:
Dimitris Sotirakis
2021-09-02 12:57:11 +03:00
committed by GitHub
parent fe65021c14
commit a5ce61b539
6 changed files with 37 additions and 37 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.14.1
ARG BASE_IMAGE=alpine:3.14.2
FROM ${BASE_IMAGE}
ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"
@@ -27,7 +27,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 openssl musl-utils libcrypto1.1>1.1.1l-r0 libssl1.1>1.1.1l-r0
apk add --no-cache 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.14.1"
base_image="${base_arch}alpine:3.14.2"
else
libc=""
dockerfile="ubuntu.Dockerfile"