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

Force use versions of libcrypto1.1 and libssl1.1 (#38585)

Browse Source
This commit is contained in:
Dimitris Sotirakis 2021-08-26 16:22:53 +03:00 committed by GitHub
parent a583f7e160
commit 00886afaf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -51,7 +51,7 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \
WORKDIR $GF_PATHS_HOME WORKDIR $GF_PATHS_HOME
RUN apk add --no-cache ca-certificates bash tzdata && \ 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 COPY conf ./conf

2
packaging/docker/Dockerfile
View File

@ -27,7 +27,7 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
WORKDIR $GF_PATHS_HOME WORKDIR $GF_PATHS_HOME
RUN apk add --no-cache ca-certificates bash tzdata && \ 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 # Oracle Support for x86_64 only
RUN if [ `arch` = "x86_64" ]; then \ RUN if [ `arch` = "x86_64" ]; then \