Merge "Switch to UTF-8 for all container-images"
diff --git a/container-images/base/Dockerfile b/container-images/base/Dockerfile
index e760f4c..2d819ea 100644
--- a/container-images/base/Dockerfile
+++ b/container-images/base/Dockerfile
@@ -1,5 +1,8 @@
 FROM alpine:3.10.0
 
+ENV LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8
+
 RUN apk update && \
     apk add --no-cache git
 
diff --git a/container-images/gerrit-init/Dockerfile b/container-images/gerrit-init/Dockerfile
index 69860f9..a1a6dd1 100644
--- a/container-images/gerrit-init/Dockerfile
+++ b/container-images/gerrit-init/Dockerfile
@@ -2,9 +2,6 @@
 
 USER root
 
-ENV LC_ALL=C.UTF-8
-ENV LANG=C.UTF-8
-
 COPY tools/* /var/tools/
 WORKDIR /var/tools