From fc676766b4c4b1a7afb857342b9adef78b09f28b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 8 Feb 2017 16:22:56 -0800 Subject: [PATCH] Put "docker-entrypoint.sh" in PATH (with backwards-compat symlink) --- 9.2/Dockerfile | 6 +++--- 9.2/alpine/Dockerfile | 6 +++--- 9.3/Dockerfile | 6 +++--- 9.3/alpine/Dockerfile | 6 +++--- 9.4/Dockerfile | 6 +++--- 9.4/alpine/Dockerfile | 6 +++--- 9.5/Dockerfile | 6 +++--- 9.5/alpine/Dockerfile | 6 +++--- 9.6/Dockerfile | 6 +++--- 9.6/alpine/Dockerfile | 6 +++--- Dockerfile-alpine.template | 6 +++--- Dockerfile-debian.template | 6 +++--- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/9.2/Dockerfile b/9.2/Dockerfile index 1083962d9f..703743d1af 100644 --- a/9.2/Dockerfile +++ b/9.2/Dockerfile @@ -61,9 +61,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"] diff --git a/9.2/alpine/Dockerfile b/9.2/alpine/Dockerfile index 6ba06f2f41..ecc8f2d69d 100644 --- a/9.2/alpine/Dockerfile +++ b/9.2/alpine/Dockerfile @@ -124,9 +124,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"] diff --git a/9.3/Dockerfile b/9.3/Dockerfile index 3e03a4bafc..84a2063743 100644 --- a/9.3/Dockerfile +++ b/9.3/Dockerfile @@ -61,9 +61,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"] diff --git a/9.3/alpine/Dockerfile b/9.3/alpine/Dockerfile index 15a490aad4..4e299ef796 100644 --- a/9.3/alpine/Dockerfile +++ b/9.3/alpine/Dockerfile @@ -124,9 +124,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"] diff --git a/9.4/Dockerfile b/9.4/Dockerfile index fa82c6820c..ba096d3c35 100644 --- a/9.4/Dockerfile +++ b/9.4/Dockerfile @@ -61,9 +61,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"] diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile index a796bff2c9..8fc41f38f4 100644 --- a/9.4/alpine/Dockerfile +++ b/9.4/alpine/Dockerfile @@ -124,9 +124,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"] diff --git a/9.5/Dockerfile b/9.5/Dockerfile index d58d18dd8a..2019945645 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -61,9 +61,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"] diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile index 37b3a66862..1530c78fd0 100644 --- a/9.5/alpine/Dockerfile +++ b/9.5/alpine/Dockerfile @@ -124,9 +124,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"] diff --git a/9.6/Dockerfile b/9.6/Dockerfile index 4116d3b0d3..8f0ff3183b 100644 --- a/9.6/Dockerfile +++ b/9.6/Dockerfile @@ -61,9 +61,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"] diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index f816070b37..03b8b1163a 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -124,9 +124,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"] diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 4f8655b96e..251e47e282 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -124,9 +124,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"] diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index e07588a01b..27ea4186b6 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -61,9 +61,9 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) VOLUME /var/lib/postgresql/data -COPY docker-entrypoint.sh / - -ENTRYPOINT ["/docker-entrypoint.sh"] +COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat +ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 5432 CMD ["postgres"]