Merge pull request #97 from jakirkham/ensure_locales_work

Ensure locales work
conda-forge · Jun 27, 2019 · 260c85f · 260c85f
2 parents df76223 + dacf042
commit 260c85f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/linux-anvil-aarch64/Dockerfile b/linux-anvil-aarch64/Dockerfile
@@ -18,7 +18,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 # to the point of not being properly functional
 # See: https://github.com/CentOS/sig-cloud-instance-images/issues/71
 RUN yum update -y && \
-    yum reinstall -y glibc-common
+    yum reinstall -y glibc-common && \
+    yum clean all
 RUN localedef -i en_US -f UTF-8 en_US.UTF-8
 
 # Install basic requirements.

diff --git a/linux-anvil-comp7/Dockerfile b/linux-anvil-comp7/Dockerfile
@@ -11,6 +11,14 @@ ADD http://worldclockapi.com/api/json/utc/now /opt/docker/etc/timestamp
 # Resolves a nasty NOKEY warning that appears when using yum.
 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
 
+# Fix up issues with locales because the default images have these minimized
+# to the point of not being properly functional
+# See: https://github.com/CentOS/sig-cloud-instance-images/issues/71
+RUN yum update -y && \
+    yum reinstall -y glibc-common && \
+    yum clean all
+RUN localedef -i en_US -f UTF-8 en_US.UTF-8
+
 # Install basic requirements.
 RUN yum update -y && \
     yum install -y \

diff --git a/linux-anvil-cuda/Dockerfile b/linux-anvil-cuda/Dockerfile
@@ -19,6 +19,14 @@ ADD http://worldclockapi.com/api/json/utc/now /opt/docker/etc/timestamp
 # Resolves a nasty NOKEY warning that appears when using yum.
 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
 
+# Fix up issues with locales because the default images have these minimized
+# to the point of not being properly functional
+# See: https://github.com/CentOS/sig-cloud-instance-images/issues/71
+RUN yum update -y && \
+    yum reinstall -y glibc-common && \
+    yum clean all
+RUN localedef -i en_US -f UTF-8 en_US.UTF-8
+
 # Remove preinclude system compilers
 RUN rpm -e --nodeps --verbose gcc gcc-c++
 

diff --git a/linux-anvil-ppc64le/Dockerfile b/linux-anvil-ppc64le/Dockerfile
@@ -19,7 +19,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 # to the point of not being properly functional
 # See: https://github.com/CentOS/sig-cloud-instance-images/issues/71
 RUN yum update -y && \
-    yum reinstall -y glibc-common
+    yum reinstall -y glibc-common && \
+    yum clean all
 RUN localedef -i en_US -f UTF-8 en_US.UTF-8
 
 # Install basic requirements.