From c12d1727f01eeb036873e1e782a31ff3fc9dacde Mon Sep 17 00:00:00 2001 From: Emil Tullstedt Date: Wed, 6 Jul 2022 17:30:56 +0200 Subject: [PATCH] Docker: Update glibc version (#51107) --- packaging/docker/Dockerfile | 14 +++++++------- packaging/docker/README.md | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index b9efa36aeea..2b88967dec7 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -35,13 +35,13 @@ RUN apk add --no-cache openssl --repository=http://dl-cdn.alpinelinux.org/alpine RUN if [ `arch` = "x86_64" ]; then \ apk add --no-cache libaio libnsl && \ ln -s /usr/lib/libnsl.so.2 /usr/lib/libnsl.so.1 && \ - wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-2.30-r0.apk \ - -O /tmp/glibc-2.30-r0.apk && \ - wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-bin-2.30-r0.apk \ - -O /tmp/glibc-bin-2.30-r0.apk && \ - apk add --no-cache --allow-untrusted /tmp/glibc-2.30-r0.apk /tmp/glibc-bin-2.30-r0.apk && \ - rm -f /tmp/glibc-2.30-r0.apk && \ - rm -f /tmp/glibc-bin-2.30-r0.apk && \ + wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \ + -O /tmp/glibc-2.35-r0.apk && \ + wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk \ + -O /tmp/glibc-bin-2.35-r0.apk && \ + apk add --no-cache --allow-untrusted /tmp/glibc-2.35-r0.apk /tmp/glibc-bin-2.35-r0.apk && \ + rm -f /tmp/glibc-2.35-r0.apk && \ + rm -f /tmp/glibc-bin-2.35-r0.apk && \ rm -f /lib/ld-linux-x86-64.so.2 && \ rm -f /etc/ld.so.cache; \ fi diff --git a/packaging/docker/README.md b/packaging/docker/README.md index ea592592fce..d2b1a889262 100644 --- a/packaging/docker/README.md +++ b/packaging/docker/README.md @@ -16,6 +16,10 @@ Further documentation can be found at http://docs.grafana.org/installation/docke ## Changelog +### v9.0.3 + +- Upgraded glibc version to glibc [2.35](https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html) [#51107](https://github.com/grafana/grafana/pull/51107/files) + ### v8.3.0-beta2 - Our Alpine based images have been upgraded to Alpine [3.14.3](https://alpinelinux.org/posts/Alpine-3.14.3-released.html) [#41922](https://github.com/grafana/grafana/pull/41922) [@hairyhenderson](https://github.com/hairyhenderson)