Skip to content

Commit 93d02cd

Browse files
author
Dinakar Guniguntala
authored
Merge pull request AdoptOpenJDK#70 from moritzraho/master
alpine: verified download + fixed version for zlib, gcc-libs and glibc
2 parents 645b79a + d71c870 commit 93d02cd

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

dockerfile_functions.sh

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,23 @@ print_alpine_pkg() {
8787
cat >> $1 <<'EOI'
8888
8989
RUN apk --update add --no-cache ca-certificates curl openssl binutils xz \
90-
&& GLIBC_VER="2.25-r0" \
90+
&& GLIBC_VER="2.28-r0" \
9191
&& ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" \
92+
&& GCC_LIBS_URL="https://archive.archlinux.org/packages/g/gcc-libs/gcc-libs-8.2.1%2B20180831-1-x86_64.pkg.tar.xz" \
93+
&& GCC_LIBS_SHA256=e4b39fb1f5957c5aab5c2ce0c46e03d30426f3b94b9992b009d417ff2d56af4d \
94+
&& ZLIB_URL="https://archive.archlinux.org/packages/z/zlib/zlib-1%3A1.2.9-1-x86_64.pkg.tar.xz" \
95+
&& ZLIB_SHA256=bb0959c08c1735de27abf01440a6f8a17c5c51e61c3b4c707e988c906d3b7f67 \
96+
&& curl -Ls https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \
9297
&& curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/${GLIBC_VER}.apk \
93-
&& apk add --allow-untrusted /tmp/${GLIBC_VER}.apk \
94-
&& curl -Ls https://www.archlinux.org/packages/core/x86_64/gcc-libs/download > /tmp/gcc-libs.tar.xz \
98+
&& apk add /tmp/${GLIBC_VER}.apk \
99+
&& curl -Ls ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.xz \
100+
&& echo "${GCC_LIBS_SHA256} /tmp/gcc-libs.tar.xz" | sha256sum -c - \
95101
&& mkdir /tmp/gcc \
96102
&& tar -xf /tmp/gcc-libs.tar.xz -C /tmp/gcc \
97103
&& mv /tmp/gcc/usr/lib/libgcc* /tmp/gcc/usr/lib/libstdc++* /usr/glibc-compat/lib \
98104
&& strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so* \
99-
&& curl -Ls https://www.archlinux.org/packages/core/x86_64/zlib/download > /tmp/libz.tar.xz \
105+
&& curl -Ls ${ZLIB_URL} -o /tmp/libz.tar.xz \
106+
&& echo "${ZLIB_SHA256} /tmp/libz.tar.xz" | sha256sum -c - \
100107
&& mkdir /tmp/libz \
101108
&& tar -xf /tmp/libz.tar.xz -C /tmp/libz \
102109
&& mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \

0 commit comments

Comments
 (0)