Merge pull request docker-library#226 from lockie/master

tianon · web-flow · commit d2b38544770a · 2016-11-22T12:19:19.000-08:00
Add missing timezone info to alpine variant
diff --git a/9.2/alpine/Dockerfile b/9.2/alpine/Dockerfile
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
diff --git a/9.3/alpine/Dockerfile b/9.3/alpine/Dockerfile
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
