1
0
mirror of https://github.com/docker-library/postgres.git synced 2025-11-17 13:02:40 +03:00

Add a note about "tzdata", adjust configuration appropriately, and remove fetch deps too

This commit is contained in:
Tianon Gravi
2016-11-03 14:59:10 -07:00
parent a9c1b15a7a
commit 797fadcad2
6 changed files with 36 additions and 6 deletions

View File

@@ -98,13 +98,18 @@ RUN set -ex \
$runDeps \ $runDeps \
bash \ bash \
su-exec \ su-exec \
&& apk del .build-deps \ # tzdata loading functionality is optional, and fails gracefully
# tzdata \
&& apk del .fetch-deps .build-deps \
&& cd / \ && cd / \
&& rm -rf \ && rm -rf \
/usr/src/postgresql \ /usr/src/postgresql \
/usr/local/include/* \ /usr/local/include/* \
&& find /usr/local -name '*.a' -delete && find /usr/local -name '*.a' -delete
# make the sample config easier to munge (and "correct by default")
RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH

View File

@@ -98,13 +98,18 @@ RUN set -ex \
$runDeps \ $runDeps \
bash \ bash \
su-exec \ su-exec \
&& apk del .build-deps \ # tzdata loading functionality is optional, and fails gracefully
# tzdata \
&& apk del .fetch-deps .build-deps \
&& cd / \ && cd / \
&& rm -rf \ && rm -rf \
/usr/src/postgresql \ /usr/src/postgresql \
/usr/local/include/* \ /usr/local/include/* \
&& find /usr/local -name '*.a' -delete && find /usr/local -name '*.a' -delete
# make the sample config easier to munge (and "correct by default")
RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH

View File

@@ -98,13 +98,18 @@ RUN set -ex \
$runDeps \ $runDeps \
bash \ bash \
su-exec \ su-exec \
&& apk del .build-deps \ # tzdata loading functionality is optional, and fails gracefully
# tzdata \
&& apk del .fetch-deps .build-deps \
&& cd / \ && cd / \
&& rm -rf \ && rm -rf \
/usr/src/postgresql \ /usr/src/postgresql \
/usr/local/include/* \ /usr/local/include/* \
&& find /usr/local -name '*.a' -delete && find /usr/local -name '*.a' -delete
# make the sample config easier to munge (and "correct by default")
RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH

View File

@@ -98,13 +98,18 @@ RUN set -ex \
$runDeps \ $runDeps \
bash \ bash \
su-exec \ su-exec \
&& apk del .build-deps \ # tzdata loading functionality is optional, and fails gracefully
# tzdata \
&& apk del .fetch-deps .build-deps \
&& cd / \ && cd / \
&& rm -rf \ && rm -rf \
/usr/src/postgresql \ /usr/src/postgresql \
/usr/local/include/* \ /usr/local/include/* \
&& find /usr/local -name '*.a' -delete && find /usr/local -name '*.a' -delete
# make the sample config easier to munge (and "correct by default")
RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH

View File

@@ -98,13 +98,18 @@ RUN set -ex \
$runDeps \ $runDeps \
bash \ bash \
su-exec \ su-exec \
&& apk del .build-deps \ # tzdata loading functionality is optional, and fails gracefully
# tzdata \
&& apk del .fetch-deps .build-deps \
&& cd / \ && cd / \
&& rm -rf \ && rm -rf \
/usr/src/postgresql \ /usr/src/postgresql \
/usr/local/include/* \ /usr/local/include/* \
&& find /usr/local -name '*.a' -delete && find /usr/local -name '*.a' -delete
# make the sample config easier to munge (and "correct by default")
RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH

View File

@@ -98,13 +98,18 @@ RUN set -ex \
$runDeps \ $runDeps \
bash \ bash \
su-exec \ su-exec \
&& apk del .build-deps \ # tzdata loading functionality is optional, and fails gracefully
# tzdata \
&& apk del .fetch-deps .build-deps \
&& cd / \ && cd / \
&& rm -rf \ && rm -rf \
/usr/src/postgresql \ /usr/src/postgresql \
/usr/local/include/* \ /usr/local/include/* \
&& find /usr/local -name '*.a' -delete && find /usr/local -name '*.a' -delete
# make the sample config easier to munge (and "correct by default")
RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH