8000 Merge pull request #226 from lockie/master · cliixtech/postgres@d2b3854 · GitHub
[go: up one dir, main page]
Skip to content

Commit d2b3854

Browse files
tianontianon
authored
Merge pull request docker-library#226 from lockie/master
Add missing timezone info to alpine variant
2 parents 1b0fec8 + 9c98875 commit d2b3854

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

‎9.2/alpine/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ RUN set -ex \
9898
$runDeps \
9999
bash \
100100
su-exec \
101-
# tzdata loading functionality is optional, and fails gracefully
102-
# tzdata \
101+
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
102+
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
103+
tzdata \
103104
&& apk del .fetch-deps .build-deps \
104105
&& cd / \
105106
&& rm -rf \

‎9.3/alpine/Dockerfile

Lines changed: 3 additions & 2 deletions
< 10000 td data-grid-cell-id="diff-725a22b1e94dde0665dd30c7cd5012178a50089f8b1f2b864fe8002b7dbede95-empty-empty-0" data-selected="false" role="gridcell" style="background-color:var(--bgColor-accent-muted, var(--color-accent-subtle));flex-grow:1" tabindex="-1" valign="top" class="focusable-grid-cell diff-hunk-cell left-side" colSpan="4">
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ RUN set -ex \
9898
$runDeps \
9999
bash \
100100
su-exec \
101-
# tzdata loading functionality is optional, and fails gracefully
102-
# tzdata \
101+
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
102+
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
103+
tzdata \
103104
&& apk del .fetch-deps .build-deps \
104105
&& cd / \
105106
&& rm -rf \

‎9.4/alpine/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ RUN set -ex \
9898
$runDeps \
9999
bash \
100100
su-exec \
101-
# tzdata loading functionality is optional, and fails gracefully
102-
# tzdata \
101+
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
102+
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
103+
tzdata \
103104
&& apk del .fetch-deps .build-deps \
104105
&& cd / \
105106
&& rm -rf \

‎9.5/alpine/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ RUN set -ex \
9898
$runDeps \
9999
bash \
100100
su-exec \
101-
# tzdata loading functionality is optional, and fails gracefully
102-
# tzdata \
101+
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
102+
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
103+
tzdata \
103104
&& apk del .fetch-deps .build-deps \
104105
&& cd / \
105106
&& rm -rf \

‎9.6/alpine/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ RUN set -ex \
9898
$runDeps \
9999
bash \
100100
su-exec \
101-
# tzdata loading functionality is optional, and fails gracefully
102-
# tzdata \
101+
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
102+
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
103+
tzdata \
103104
&& apk del .fetch-deps .build-deps \
104105
&& cd / \
105106
&& rm -rf \

‎Dockerfile-alpine.template

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ RUN set -ex \
9898
$runDeps \
9999
bash \
100100
su-exec \
101-
# tzdata loading functionality is optional, and fails gracefully
102-
# tzdata \
101+
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
102+
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
103+
tzdata \
103104
&& apk del .fetch-deps .build-deps \
104105
&& cd / \
105106
&& rm -rf \

0 commit comments

Comments
 (0)
0