From 5512b0793993847ff2c8dacd53fb3575d948eb77 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 26 Aug 2021 15:50:57 +0200 Subject: [PATCH] Force use versions of libcrypto1.1 and libssl1.1 (#38585) (#38597) (cherry picked from commit 00886afaf110907b5c0b6b98c680c4a21b09c283) Co-authored-by: Dimitris Sotirakis --- Dockerfile | 2 +- packaging/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5e043826247..c155e20aba9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,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 openssl musl-utils + apk add --no-cache openssl musl-utils libcrypto1.1>1.1.1l-r0 libssl1.1>1.1.1l-r0 COPY conf ./conf diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 052814b2bcf..a73cf4f67cd 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -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 + apk add --no-cache openssl musl-utils libcrypto1.1>1.1.1l-r0 libssl1.1>1.1.1l-r0 # Oracle Support for x86_64 only RUN if [ `arch` = "x86_64" ]; then \