File tree 6 files changed +36
-6
lines changed
6 files changed +36
-6
lines changed Original file line number Diff line number Diff line change @@ -98,13 +98,18 @@ RUN set -ex \
98
98
$runDeps \
99
99
bash \
100
100
su-exec \
101
- && apk del .build-deps \
101
+ # tzdata loading functionality is optional, and fails gracefully
102
+ # tzdata \
103
+ && apk del .fetch-deps .build-deps \
102
104
&& cd / \
103
105
&& rm -rf \
104
106
/usr/src/postgresql \
105
107
/usr/local/include/* \
106
108
&& find /usr/local -name '*.a' -delete
107
109
110
+ # make the sample config easier to munge (and "correct by default")
111
+ RUN sed -ri "s!^#?(listen_addresses)\s *=\s *\S +.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
112
+
108
113
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
109
114
110
115
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
Original file line number Diff line number Diff line change @@ -98,13 +98,18 @@ RUN set -ex \
98
98
$runDeps \
99
99
bash \
100
100
su-exec \
101
- && apk del .build-deps \
101
+ # tzdata loading functionality is optional, and fails gracefully
102
+ # tzdata \
103
+ && apk del .fetch-deps .build-deps \
102
104
&& cd / \
103
105
&& rm -rf \
104
106
/usr/src/postgresql \
105
107
/usr/local/include/* \
106
108
&& find /usr/local -name '*.a' -delete
107
109
110
+ # make the sample config easier to munge (and "correct by default")
111
+ RUN sed -ri "s!^#?(listen_addresses)\s *=\s *\S +.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
112
+
108
113
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
109
114
110
115
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
Original file line number Diff line number Diff line change @@ -98,13 +98,18 @@ RUN set -ex \
98
98
$runDeps \
99
99
bash \
100
100
su-exec \
101
- && apk del .build-deps \
101
+ # tzdata loading functionality is optional, and fails gracefully
102
+ # tzdata \
103
+ && apk del .fetch-deps .build-deps \
102
104
&& cd / \
103
105
&& rm -rf \
104
106
/usr/src/postgresql \
105
107
/usr/local/include/* \
106
108
&& find /usr/local -name '*.a' -delete
107
109
110
+ # make the sample config easier to munge (and "correct by default")
111
+ RUN sed -ri "s!^#?(listen_addresses)\s *=\s *\S +.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
112
+
108
113
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
109
114
110
115
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
Original file line number Diff line number Diff line change @@ -98,13 +98,18 @@ RUN set -ex \
98
98
$runDeps \
99
99
bash \
100
100
su-exec \
101
- && apk del .build-deps \
101
+ # tzdata loading functionality is optional, and fails gracefully
102
+ # tzdata \
103
+ && apk del .fetch-deps .build-deps \
102
104
&& cd / \
103
105
&& rm -rf \
104
106
/usr/src/postgresql \
105
107
/usr/local/include/* \
106
108
&& find /usr/local -name '*.a' -delete
107
109
110
+ # make the sample config easier to munge (and "correct by default")
111
+ RUN sed -ri "s!^#?(listen_addresses)\s *=\s *\S +.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
112
+
108
113
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
109
114
110
115
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
Original file line number Diff line number Diff line change @@ -98,13 +98,18 @@ RUN set -ex \
98
98
$runDeps \
99
99
bash \
100
100
su-exec \
101
- && apk del .build-deps \
101
+ # tzdata loading functionality is optional, and fails gracefully
102
+ # tzdata \
103
+ && apk del .fetch-deps .build-deps \
102
104
&& cd / \
103
105
&& rm -rf \
104
106
/usr/src/postgresql \
105
107
/usr/local/include/* \
106
108
&& find /usr/local -name '*.a' -delete
107
109
110
+ # make the sample config easier to munge (and "correct by default")
111
+ RUN sed -ri "s!^#?(listen_addresses)\s *=\s *\S +.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
112
+
108
113
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
109
114
110
115
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
Original file line number Diff line number Diff line change @@ -98,13 +98,18 @@ RUN set -ex \
98
98
$runDeps \
99
99
bash \
100
100
su-exec \
101
- && apk del .build-deps \
101
+ # tzdata loading functionality is optional, and fails gracefully
102
+ # tzdata \
103
+ && apk del .fetch-deps .build-deps \
102
104
&& cd / \
103
105
&& rm -rf \
104
106
/usr/src/postgresql \
105
107
/usr/local/include/* \
106
108
&& find /usr/local -name '*.a' -delete
107
109
110
+ # make the sample config easier to munge (and "correct by default")
111
+ RUN sed -ri "s!^#?(listen_addresses)\s *=\s *\S +.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
112
+
108
113
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
109
114
110
115
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
You can’t perform that action at this time.
0 commit comments