cleanup

Dockerfile

@@ -16,12 +16,26 @@ RUN apt-get update && \
     echo "PasswordAuthentication no" >> /etc/ssh/sshd_config && \
     echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config
 
+RUN set -eux; \
+	grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker && \
+	sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker && \
+	! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker && \
+	apt-get update && \
+    apt-get install -y --no-install-recommends \
+            locales && \
+    rm -rf /var/lib/apt/lists/* && \
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && \
+	locale-gen && \
+	locale -a | grep 'en_US.utf8'
+ENV LANG=en_US.utf8
 
 RUN set -ex && \
 	apt-get update && \
 	apt-get install -y --no-install-recommends \
 		gnupg \
 		less \
+    	xz-utils \
+    	zstd \
 	    && \
 	rm -rf /var/lib/apt/lists/*
 
@@ -49,27 +63,6 @@ RUN set -eux && \
 	gosu --version && \
 	gosu nobody true
 
-RUN set -eux; \
-	grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker && \
-	sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker && \
-	! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker && \
-	apt-get update && \
-    apt-get install -y --no-install-recommends \
-            locales && \
-    rm -rf /var/lib/apt/lists/* && \
-	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && \
-	locale-gen && \
-	locale -a | grep 'en_US.utf8'
-ENV LANG=en_US.utf8
-
-RUN set -eux && \
-	apt-get update && \
-	apt-get install -y --no-install-recommends \
-		xz-utils \
-		zstd \
-        && \
-	rm -rf /var/lib/apt/lists/*
-
 RUN set -ex && \
 	key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' && \
 	export GNUPGHOME="$(mktemp -d)" && \