From b031aa800308c595624b8d2e43707dbb2861d2f1 Mon Sep 17 00:00:00 2001 From: Andrew Kravchuk Date: Tue, 22 Nov 2016 11:38:25 +0300 Subject: [PATCH 1/2] Add missing timezone info to alpine variant --- 9.2/alpine/Dockerfile | 4 ++-- 9.3/alpine/Dockerfile | 4 ++-- 9.4/alpine/Dockerfile | 4 ++-- 9.5/alpine/Dockerfile | 4 ++-- 9.6/alpine/Dockerfile | 4 ++-- Dockerfile-alpine.template | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/9.2/alpine/Dockerfile b/9.2/alpine/Dockerfile index 0a0748b8ff..fbb6825a98 100644 --- a/9.2/alpine/Dockerfile +++ b/9.2/alpine/Dockerfile @@ -98,8 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata loading functionality is optional, and fails gracefully -# tzdata \ +# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 + tzdata \ && apk del .fetch-deps .build-deps \ && cd / \ && rm -rf \ diff --git a/9.3/alpine/Dockerfile b/9.3/alpine/Dockerfile index e4a08ac456..fed8b907ee 100644 --- a/9.3/alpine/Dockerfile +++ b/9.3/alpine/Dockerfile @@ -98,8 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata loading functionality is optional, and fails gracefully -# tzdata \ +# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 + tzdata \ && apk del .fetch-deps .build-deps \ && cd / \ && rm -rf \ diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile index 8192dbfb1d..b74b06efa5 100644 --- a/9.4/alpine/Dockerfile +++ b/9.4/alpine/Dockerfile @@ -98,8 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata loading functionality is optional, and fails gracefully -# tzdata \ +# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 + tzdata \ && apk del .fetch-deps .build-deps \ && cd / \ && rm -rf \ diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile index f6b88470ff..9920b38a79 100644 --- a/9.5/alpine/Dockerfile +++ b/9.5/alpine/Dockerfile @@ -98,8 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata loading functionality is optional, and fails gracefully -# tzdata \ +# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 + tzdata \ && apk del .fetch-deps .build-deps \ && cd / \ && rm -rf \ diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index d7a45299bc..40a14419b8 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -98,8 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata loading functionality is optional, and fails gracefully -# tzdata \ +# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 + tzdata \ && apk del .fetch-deps .build-deps \ && cd / \ && rm -rf \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index c51348bf70..c17b6215d3 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -98,8 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata loading functionality is optional, and fails gracefully -# tzdata \ +# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 + tzdata \ && apk del .fetch-deps .build-deps \ && cd / \ && rm -rf \ From 9c9887539c87214bf86e76cafef52bf8c7e4d22f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 22 Nov 2016 10:36:39 -0800 Subject: [PATCH 2/2] Expand bit.ly link and adjust wording a bit --- 9.2/alpine/Dockerfile | 3 ++- 9.3/alpine/Dockerfile | 3 ++- 9.4/alpine/Dockerfile | 3 ++- 9.5/alpine/Dockerfile | 3 ++- 9.6/alpine/Dockerfile | 3 ++- Dockerfile-alpine.template | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/9.2/alpine/Dockerfile b/9.2/alpine/Dockerfile index fbb6825a98..dc54d353cf 100644 --- a/9.2/alpine/Dockerfile +++ b/9.2/alpine/Dockerfile @@ -98,7 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 +# 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 / \ diff --git a/9.3/alpine/Dockerfile b/9.3/alpine/Dockerfile index fed8b907ee..6e9886d9d3 100644 --- a/9.3/alpine/Dockerfile +++ b/9.3/alpine/Dockerfile @@ -98,7 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 +# 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 / \ diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile index b74b06efa5..7801d68746 100644 --- a/9.4/alpine/Dockerfile +++ b/9.4/alpine/Dockerfile @@ -98,7 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 +# 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 / \ diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile index 9920b38a79..6e8b1497e1 100644 --- a/9.5/alpine/Dockerfile +++ b/9.5/alpine/Dockerfile @@ -98,7 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 +# 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 / \ diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index 40a14419b8..b918a72403 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -98,7 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 +# 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 / \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index c17b6215d3..b012b7b560 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -98,7 +98,8 @@ RUN set -ex \ $runDeps \ bash \ su-exec \ -# tzdata adds around 1Mb to image size, but it is suggested by Django documentation that timezone should be set for performance reasons: http://bit.ly/2fMYhh1 +# 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 / \