Skip to content

Commit 1c9dc00

Browse files
authored
Merge pull request AdoptOpenJDK#155 from grzesuav/105_alpine_utf8
fix: AdoptOpenJDK#105 - Set locale in alpine image
2 parents 4ccff2f + 8e2576d commit 1c9dc00

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

dockerfile_functions.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,14 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
126126
&& curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \
127127
&& SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2" \
128128
&& echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - \
129-
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/${GLIBC_VER}.apk \
130-
&& apk add /tmp/${GLIBC_VER}.apk \
129+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk \
130+
&& apk add /tmp/glibc-${GLIBC_VER}.apk \
131+
&& curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk \
132+
&& apk add /tmp/glibc-bin-${GLIBC_VER}.apk \
133+
&& curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk \
134+
&& apk add /tmp/glibc-i18n-${GLIBC_VER}.apk \
135+
&& /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true \
136+
&& echo "export LANG=$LANG" > /etc/profile.d/locale.sh \
131137
&& curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.xz \
132138
&& echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.xz" | sha256sum -c - \
133139
&& mkdir /tmp/gcc \
@@ -139,7 +145,7 @@ RUN apk add --no-cache --virtual .build-deps curl binutils \
139145
&& mkdir /tmp/libz \
140146
&& tar -xf /tmp/libz.tar.xz -C /tmp/libz \
141147
&& mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \
142-
&& apk del --purge .build-deps \
148+
&& apk del --purge .build-deps glibc-i18n \
143149
&& rm -rf /tmp/${GLIBC_VER}.apk /tmp/gcc /tmp/gcc-libs.tar.xz /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*
144150
EOI
145151
}

0 commit comments

Comments
 (0)