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

Update to gosu 1.12

This commit is contained in:
Tianon Gravi
2020-04-16 00:30:52 -07:00
parent 17c71aef19
commit a1420dac64
6 changed files with 126 additions and 78 deletions

View File

@@ -22,19 +22,27 @@ RUN set -eux; \
chown -R postgres:postgres /var/lib/postgresql chown -R postgres:postgres /var/lib/postgresql
# grab gosu for easy step-down from root # grab gosu for easy step-down from root
ENV GOSU_VERSION 1.11 # https://github.com/tianon/gosu/releases
RUN set -x \ ENV GOSU_VERSION 1.12
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \ RUN set -eux; \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ savedAptMark="$(apt-mark showmanual)"; \
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ apt-get update; \
&& export GNUPGHOME="$(mktemp -d)" \ apt-get install -y --no-install-recommends ca-certificates wget; \
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ rm -rf /var/lib/apt/lists/*; \
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
&& chmod +x /usr/local/bin/gosu \ export GNUPGHOME="$(mktemp -d)"; \
&& gosu nobody true \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
&& apt-get purge -y --auto-remove ca-certificates wget gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
gpgconf --kill all; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
chmod +x /usr/local/bin/gosu; \
gosu --version; \
gosu nobody true
# make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
RUN set -eux; \ RUN set -eux; \

View File

@@ -22,19 +22,27 @@ RUN set -eux; \
chown -R postgres:postgres /var/lib/postgresql chown -R postgres:postgres /var/lib/postgresql
# grab gosu for easy step-down from root # grab gosu for easy step-down from root
ENV GOSU_VERSION 1.11 # https://github.com/tianon/gosu/releases
RUN set -x \ ENV GOSU_VERSION 1.12
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \ RUN set -eux; \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ savedAptMark="$(apt-mark showmanual)"; \
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ apt-get update; \
&& export GNUPGHOME="$(mktemp -d)" \ apt-get install -y --no-install-recommends ca-certificates wget; \
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ rm -rf /var/lib/apt/lists/*; \
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
&& chmod +x /usr/local/bin/gosu \ export GNUPGHOME="$(mktemp -d)"; \
&& gosu nobody true \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
&& apt-get purge -y --auto-remove ca-certificates wget gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
gpgconf --kill all; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
chmod +x /usr/local/bin/gosu; \
gosu --version; \
gosu nobody true
# make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
RUN set -eux; \ RUN set -eux; \

View File

@@ -22,19 +22,27 @@ RUN set -eux; \
chown -R postgres:postgres /var/lib/postgresql chown -R postgres:postgres /var/lib/postgresql
# grab gosu for easy step-down from root # grab gosu for easy step-down from root
ENV GOSU_VERSION 1.11 # https://github.com/tianon/gosu/releases
RUN set -x \ ENV GOSU_VERSION 1.12
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \ RUN set -eux; \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ savedAptMark="$(apt-mark showmanual)"; \
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ apt-get update; \
&& export GNUPGHOME="$(mktemp -d)" \ apt-get install -y --no-install-recommends ca-certificates wget; \
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ rm -rf /var/lib/apt/lists/*; \
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
&& chmod +x /usr/local/bin/gosu \ export GNUPGHOME="$(mktemp -d)"; \
&& gosu nobody true \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
&& apt-get purge -y --auto-remove ca-certificates wget gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
gpgconf --kill all; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
chmod +x /usr/local/bin/gosu; \
gosu --version; \
gosu nobody true
# make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
RUN set -eux; \ RUN set -eux; \

View File

@@ -22,19 +22,27 @@ RUN set -eux; \
chown -R postgres:postgres /var/lib/postgresql chown -R postgres:postgres /var/lib/postgresql
# grab gosu for easy step-down from root # grab gosu for easy step-down from root
ENV GOSU_VERSION 1.11 # https://github.com/tianon/gosu/releases
RUN set -x \ ENV GOSU_VERSION 1.12
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \ RUN set -eux; \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ savedAptMark="$(apt-mark showmanual)"; \
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ apt-get update; \
&& export GNUPGHOME="$(mktemp -d)" \ apt-get install -y --no-install-recommends ca-certificates wget; \
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ rm -rf /var/lib/apt/lists/*; \
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
&& chmod +x /usr/local/bin/gosu \ export GNUPGHOME="$(mktemp -d)"; \
&& gosu nobody true \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
&& apt-get purge -y --auto-remove ca-certificates wget gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
gpgconf --kill all; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
chmod +x /usr/local/bin/gosu; \
gosu --version; \
gosu nobody true
# make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
RUN set -eux; \ RUN set -eux; \

View File

@@ -22,19 +22,27 @@ RUN set -eux; \
chown -R postgres:postgres /var/lib/postgresql chown -R postgres:postgres /var/lib/postgresql
# grab gosu for easy step-down from root # grab gosu for easy step-down from root
ENV GOSU_VERSION 1.11 # https://github.com/tianon/gosu/releases
RUN set -x \ ENV GOSU_VERSION 1.12
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \ RUN set -eux; \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ savedAptMark="$(apt-mark showmanual)"; \
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ apt-get update; \
&& export GNUPGHOME="$(mktemp -d)" \ apt-get install -y --no-install-recommends ca-certificates wget; \
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ rm -rf /var/lib/apt/lists/*; \
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
&& chmod +x /usr/local/bin/gosu \ export GNUPGHOME="$(mktemp -d)"; \
&& gosu nobody true \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
&& apt-get purge -y --auto-remove ca-certificates wget gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
gpgconf --kill all; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
chmod +x /usr/local/bin/gosu; \
gosu --version; \
gosu nobody true
# make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
RUN set -eux; \ RUN set -eux; \

View File

@@ -22,19 +22,27 @@ RUN set -eux; \
chown -R postgres:postgres /var/lib/postgresql chown -R postgres:postgres /var/lib/postgresql
# grab gosu for easy step-down from root # grab gosu for easy step-down from root
ENV GOSU_VERSION 1.11 # https://github.com/tianon/gosu/releases
RUN set -x \ ENV GOSU_VERSION 1.12
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \ RUN set -eux; \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ savedAptMark="$(apt-mark showmanual)"; \
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ apt-get update; \
&& export GNUPGHOME="$(mktemp -d)" \ apt-get install -y --no-install-recommends ca-certificates wget; \
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ rm -rf /var/lib/apt/lists/*; \
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
&& chmod +x /usr/local/bin/gosu \ export GNUPGHOME="$(mktemp -d)"; \
&& gosu nobody true \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
&& apt-get purge -y --auto-remove ca-certificates wget gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
gpgconf --kill all; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
chmod +x /usr/local/bin/gosu; \
gosu --version; \
gosu nobody true
# make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
RUN set -eux; \ RUN set -eux; \