Skip to content

Commit ba8e2ff

Browse files
kariannakarianna
authored
Merge pull request AdoptOpenJDK#165 from dinogun/dockerfiles_update_20190522
Update Dockerfiles with the latest changes and shasums.
2 parents d0ceae4 + 87074f2 commit ba8e2ff

File tree

124 files changed

+943
-632
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+943
-632
lines changed

‎11/jdk/alpine/Dockerfile.hotspot.nightly.full

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM alpine:3.9
2121

22-
LABEL org.opencontainers.image.authors="[email protected]"
2322
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
23+
2424
RUN apk add --no-cache --virtual .build-deps curl binutils \
2525
&& GLIBC_VER="2.29-r0" \
2626
&& ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" \
@@ -31,8 +31,14 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
3131
&& curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \
3232
&& SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2" \
3333
&& echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - \
34-
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/${GLIBC_VER}.apk \
35-
&& apk add /tmp/${GLIBC_VER}.apk \
34+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk \
35+
&& apk add /tmp/glibc-${GLIBC_VER}.apk \
36+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk \
37+
&& apk add /tmp/glibc-bin-${GLIBC_VER}.apk \
38+
&& curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk \
39+
&& apk add /tmp/glibc-i18n-${GLIBC_VER}.apk \
40+
&& /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true \
41+
&& echo "export LANG=$LANG" > /etc/profile.d/locale.sh \
3642
&& curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.xz \
3743
&& echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.xz" | sha256sum -c - \
3844
&& mkdir /tmp/gcc \
@@ -44,33 +50,34 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
4450
&& mkdir /tmp/libz \
4551
&& tar -xf /tmp/libz.tar.xz -C /tmp/libz \
4652
&& mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \
47-
&& apk del --purge .build-deps \
53+
&& apk del --purge .build-deps glibc-i18n \
4854
&& rm -rf /tmp/${GLIBC_VER}.apk /tmp/gcc /tmp/gcc-libs.tar.xz /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*
4955

5056
ENV JAVA_VERSION jdk11u
57+
5158
RUN set -eux; \
5259
apk add --virtual .fetch-deps curl; \
5360
ARCH="$(apk --print-arch)"; \
5461
case "${ARCH}" in \
5562
ppc64el|ppc64le) \
56-
ESUM='73c65749f370d8388b7304a45947d788710cdc3567d6b4d13e8a0167de6f07e0'; \
57-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2019-05-17-14-56.tar.gz'; \
63+
ESUM='b99789ce5d00cf64474f3cd60023aef63db0f58d2c9fa115e13c69ac09e952fe'; \
64+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-21-20-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2019-05-21-20-56.tar.gz'; \
5865
;; \
5966
s390x) \
6067
ESUM='4a8f4013b06a70cf68781a4c8fcaa30796402ce1f2d990fdb8ddfe93e550f77a'; \
6168
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_s390x_linux_hotspot_2019-05-17-14-56.tar.gz'; \
6269
;; \
6370
amd64|x86_64) \
64-
ESUM='adfc98ade1d166ec3f0d4fa155793dd9950abeb6eb6579a36d0fbcf94faf86c7'; \
65-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_x64_linux_hotspot_2019-05-17-14-56.tar.gz'; \
71+
ESUM='89ef1f721c47890128a6713a7cf4612feb6a71159c98970645ea4f01fdcfe8ea'; \
72+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-21-20-56/OpenJDK11U-jdk_x64_linux_hotspot_2019-05-21-20-56.tar.gz'; \
6673
;; \
6774
armhf) \
68-
ESUM='1b36928b5d27d9ea8e3afcfd562e268fa5d0f303f85b8a7054eab89f24b0fc8d'; \
69-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_arm_linux_hotspot_2019-05-17-14-56.tar.gz'; \
75+
ESUM='8da6f861302cc9c995404e0ace9127f3c16e43a30b1780428c8819e767bc0556'; \
76+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-21-20-56/OpenJDK11U-jdk_arm_linux_hotspot_2019-05-21-20-56.tar.gz'; \
7077
;; \
7178
aarch64|arm64) \
72-
ESUM='8847f25cc012993ac28022e6f9b980bb1a3b2463867c6ec3f38a526adc1fda8e'; \
73-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2019-05-17-14-56.tar.gz'; \
79+
ESUM='7289a7897dbb0327fbd56622060b62d760e1d3935ca33287a8bdfa965175ae25'; \
80+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-21-20-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2019-05-21-20-56.tar.gz'; \
7481
;; \
7582
*) \
7683
echo "Unsupported arch: ${ARCH}"; \

‎11/jdk/alpine/Dockerfile.hotspot.nightly.slim

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM alpine:3.9
2121

22-
LABEL org.opencontainers.image.authors="[email protected]"
2322
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
23+
2424
RUN apk add --no-cache --virtual .build-deps curl binutils \
2525
&& GLIBC_VER="2.29-r0" \
2626
&& ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" \
@@ -31,8 +31,14 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
3131
&& curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \
3232
&& SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2" \
3333
&& echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - \
34-
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/${GLIBC_VER}.apk \
35-
&& apk add /tmp/${GLIBC_VER}.apk \
34+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk \
35+
&& apk add /tmp/glibc-${GLIBC_VER}.apk \
36+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk \
37+
&& apk add /tmp/glibc-bin-${GLIBC_VER}.apk \
38+
&& curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk \
39+
&& apk add /tmp/glibc-i18n-${GLIBC_VER}.apk \
40+
&& /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true \
41+
&& echo "export LANG=$LANG" > /etc/profile.d/locale.sh \
3642
&& curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.xz \
3743
&& echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.xz" | sha256sum -c - \
3844
&& mkdir /tmp/gcc \
@@ -44,35 +50,36 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
4450
&& mkdir /tmp/libz \
4551
&& tar -xf /tmp/libz.tar.xz -C /tmp/libz \
4652
&& mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \
47-
&& apk del --purge .build-deps \
53+
&& apk del --purge .build-deps glibc-i18n \
4854
&& rm -rf /tmp/${GLIBC_VER}.apk /tmp/gcc /tmp/gcc-libs.tar.xz /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*
4955

5056
ENV JAVA_VERSION jdk11u
57+
5158
COPY slim-java* /usr/local/bin/
5259

5360
RUN set -eux; \
5461
apk add --virtual .fetch-deps curl; \
5562
ARCH="$(apk --print-arch)"; \
5663
case "${ARCH}" in \
5764
ppc64el|ppc64le) \
58-
ESUM='73c65749f370d8388b7304a45947d788710cdc3567d6b4d13e8a0167de6f07e0'; \
59-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2019-05-17-14-56.tar.gz'; \
65+
ESUM='b99789ce5d00cf64474f3cd60023aef63db0f58d2c9fa115e13c69ac09e952fe'; \
66+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-21-20-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2019-05-21-20-56.tar.gz'; \
6067
;; \
6168
s390x) \
6269
ESUM='4a8f4013b06a70cf68781a4c8fcaa30796402ce1f2d990fdb8ddfe93e550f77a'; \
6370
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_s390x_linux_hotspot_2019-05-17-14-56.tar.gz'; \
6471
;; \
6572
amd64|x86_64) \
66-
ESUM='adfc98ade1d166ec3f0d4fa155793dd9950abeb6eb6579a36d0fbcf94faf86c7'; \
67-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_x64_linux_hotspot_2019-05-17-14-56.tar.gz'; \
73+
ESUM='89ef1f721c47890128a6713a7cf4612feb6a71159c98970645ea4f01fdcfe8ea'; \
74+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-21-20-56/OpenJDK11U-jdk_x64_linux_hotspot_2019-05-21-20-56.tar.gz'; \
6875
;; \
6976
armhf) \
70-
ESUM='1b36928b5d27d9ea8e3afcfd562e268fa5d0f303f85b8a7054eab89f24b0fc8d'; \
71-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_arm_linux_hotspot_2019-05-17-14-56.tar.gz'; \
77+
ESUM='8da6f861302cc9c995404e0ace9127f3c16e43a30b1780428c8819e767bc0556'; \
78+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-21-20-56/OpenJDK11U-jdk_arm_linux_hotspot_2019-05-21-20-56.tar.gz'; \
7279
;; \
7380
aarch64|arm64) \
74-
ESUM='8847f25cc012993ac28022e6f9b980bb1a3b2463867c6ec3f38a526adc1fda8e'; \
75-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2019-05-17-14-56.tar.gz'; \
81+
ESUM='7289a7897dbb0327fbd56622060b62d760e1d3935ca33287a8bdfa965175ae25'; \
82+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-21-20-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2019-05-21-20-56.tar.gz'; \
7683
;; \
7784
*) \
7885
echo "Unsupported arch: ${ARCH}"; \

‎11/jdk/alpine/Dockerfile.hotspot.releases.full

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM alpine:3.9
2121

22-
LABEL org.opencontainers.image.authors="[email protected]"
2322
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
23+
2424
RUN apk add --no-cache --virtual .build-deps curl binutils \
2525
&& GLIBC_VER="2.29-r0" \
2626
&& ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" \
@@ -31,8 +31,14 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
3131
&& curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \
3232
&& SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2" \
3333
&& echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - \
34-
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/${GLIBC_VER}.apk \
35-
&& apk add /tmp/${GLIBC_VER}.apk \
34+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk \
35+
&& apk add /tmp/glibc-${GLIBC_VER}.apk \
36+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk \
37+
&& apk add /tmp/glibc-bin-${GLIBC_VER}.apk \
38+
&& curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk \
39+
&& apk add /tmp/glibc-i18n-${GLIBC_VER}.apk \
40+
&& /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true \
41+
&& echo "export LANG=$LANG" > /etc/profile.d/locale.sh \
3642
&& curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.xz \
3743
&& echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.xz" | sha256sum -c - \
3844
&& mkdir /tmp/gcc \
@@ -44,10 +50,11 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
4450
&& mkdir /tmp/libz \
4551
&& tar -xf /tmp/libz.tar.xz -C /tmp/libz \
4652
&& mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \
47-
&& apk del --purge .build-deps \
53+
&& apk del --purge .build-deps glibc-i18n \
4854
&& rm -rf /tmp/${GLIBC_VER}.apk /tmp/gcc /tmp/gcc-libs.tar.xz /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*
4955

5056
ENV JAVA_VERSION jdk-11.0.3+7
57+
5158
RUN set -eux; \
5259
apk add --virtual .fetch-deps curl; \
5360
ARCH="$(apk --print-arch)"; \

‎11/jdk/alpine/Dockerfile.hotspot.releases.slim

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM alpine:3.9
2121

22-
LABEL org.opencontainers.image.authors="[email protected]"
2322
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
23+
2424
RUN apk add --no-cache --virtual .build-deps curl binutils \
2525
&& GLIBC_VER="2.29-r0" \
2626
&& ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" \
@@ -31,8 +31,14 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
3131
&& curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \
3232
&& SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2" \
3333
&& echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - \
34-
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/${GLIBC_VER}.apk \
35-
&& apk add /tmp/${GLIBC_VER}.apk \
34+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk \
35+
&& apk add /tmp/glibc-${GLIBC_VER}.apk \
36+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk \
37+
&& apk add /tmp/glibc-bin-${GLIBC_VER}.apk \
38+
&& curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk \
39+
&& apk add /tmp/glibc-i18n-${GLIBC_VER}.apk \
40+
&& /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true \
41+
&& echo "export LANG=$LANG" > /etc/profile.d/locale.sh \
3642
&& curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.xz \
3743
&& echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.xz" | sha256sum -c - \
3844
&& mkdir /tmp/gcc \
@@ -44,10 +50,11 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
4450
&& mkdir /tmp/libz \
4551
&& tar -xf /tmp/libz.tar.xz -C /tmp/libz \
4652
&& mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \
47-
&& apk del --purge .build-deps \
53+
&& apk del --purge .build-deps glibc-i18n \
4854
&& rm -rf /tmp/${GLIBC_VER}.apk /tmp/gcc /tmp/gcc-libs.tar.xz /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*
4955

5056
ENV JAVA_VERSION jdk-11.0.3+7
57+
5158
COPY slim-java* /usr/local/bin/
5259

5360
RUN set -eux; \

‎11/jdk/alpine/Dockerfile.openj9.nightly.full

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM alpine:3.9
2121

22-
LABEL org.opencontainers.image.authors="[email protected]"
2322
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
23+
2424
RUN apk add --no-cache --virtual .build-deps curl binutils \
2525
&& GLIBC_VER="2.29-r0" \
2626
&& ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" \
@@ -31,8 +31,14 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
3131
&& curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \
3232
&& SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2" \
3333
&& echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - \
34-
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/${GLIBC_VER}.apk \
35-
&& apk add /tmp/${GLIBC_VER}.apk \
34+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk \
35+
&& apk add /tmp/glibc-${GLIBC_VER}.apk \
36+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk \
37+
&& apk add /tmp/glibc-bin-${GLIBC_VER}.apk \
38+
&& curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk \
39+
&& apk add /tmp/glibc-i18n-${GLIBC_VER}.apk \
40+
&& /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true \
41+
&& echo "export LANG=$LANG" > /etc/profile.d/locale.sh \
3642
&& curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.xz \
3743
&& echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.xz" | sha256sum -c - \
3844
&& mkdir /tmp/gcc \
@@ -44,29 +50,30 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
4450
&& mkdir /tmp/libz \
4551
&& tar -xf /tmp/libz.tar.xz -C /tmp/libz \
4652
&& mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \
47-
&& apk del --purge .build-deps \
53+
&& apk del --purge .build-deps glibc-i18n \
4854
&& rm -rf /tmp/${GLIBC_VER}.apk /tmp/gcc /tmp/gcc-libs.tar.xz /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*
4955

5056
ENV JAVA_VERSION jdk11u
57+
5158
RUN set -eux; \
5259
apk add --virtual .fetch-deps curl; \
5360
ARCH="$(apk --print-arch)"; \
5461
case "${ARCH}" in \
5562
ppc64el|ppc64le) \
56-
ESUM='556f544e17c899006514a0a5de8b20782ebd29a58bd869087dd93924b7d1d016'; \
57-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2019-05-17-14-56.tar.gz'; \
63+
ESUM='2adbf443992692b4f1b2ec1c958dd2ca04bf4070d4435416b8473e6753d9e818'; \
64+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-21-11-06/OpenJDK11U-jdk_ppc64le_linux_openj9_2019-05-21-11-06.tar.gz'; \
5865
;; \
5966
s390x) \
6067
ESUM='f28b7e6ce83cc796d22c9d1bbb2a49e8cd45d3c36ccd5ee80ce7e91c7ed16c71'; \
6168
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-16-16-51/OpenJDK11U-jdk_s390x_linux_openj9_2019-05-16-16-51.tar.gz'; \
6269
;; \
6370
amd64|x86_64) \
64-
ESUM='a3edbebf8471a3fe002a24c605411aa14b353b7a66617bdd63d3396407685c38'; \
65-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_x64_linux_openj9_2019-05-17-14-56.tar.gz'; \
71+
ESUM='2d1abb24031f441e2fbb2f61db24d0935c1c381d5268dba1a236323faaa835ff'; \
72+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-21-20-56/OpenJDK11U-jdk_x64_linux_openj9_2019-05-21-20-56.tar.gz'; \
6673
;; \
6774
aarch64|arm64) \
68-
ESUM='64c33faf22e23732ba058be4841ffb6dfa40fd19f07aea2855b08f92fc639f73'; \
69-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-17-14-56/OpenJDK11U-jdk_aarch64_linux_openj9_2019-05-17-14-56.tar.gz'; \
75+
ESUM='042c810b594ec92bfa24b8c961ffcd36d1687595cdb5737cd3cf762b243fb64b'; \
76+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-05-21-20-56/OpenJDK11U-jdk_aarch64_linux_openj9_2019-05-21-20-56.tar.gz'; \
7077
;; \
7178
*) \
7279
echo "Unsupported arch: ${ARCH}"; \

0 commit comments

Comments
 (0)