From 73d73760957c7038dd3c07212b5b9daf86a2cb38 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 19 Nov 2014 01:18:45 -0700 Subject: [PATCH] Update to gosu 1.2 (including GPG verification) --- 8.4/Dockerfile | 6 +++++- 9.0/Dockerfile | 6 +++++- 9.1/Dockerfile | 6 +++++- 9.2/Dockerfile | 6 +++++- 9.3/Dockerfile | 6 +++++- 9.4/Dockerfile | 6 +++++- Dockerfile.template | 6 +++++- 7 files changed, 35 insertions(+), 7 deletions(-) diff --git a/8.4/Dockerfile b/8.4/Dockerfile index d3be0ad934..551eea63da 100644 --- a/8.4/Dockerfile +++ b/8.4/Dockerfile @@ -5,8 +5,12 @@ FROM debian:wheezy RUN groupadd -r postgres && useradd -r -g postgres postgres # grab gosu for easy step-down from root +RUN gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* \ - && curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \ + && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \ + && gpg --verify /usr/local/bin/gosu.asc \ + && rm /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && apt-get purge -y --auto-remove curl diff --git a/9.0/Dockerfile b/9.0/Dockerfile index 9274944985..ccd80c5822 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -5,8 +5,12 @@ FROM debian:wheezy RUN groupadd -r postgres && useradd -r -g postgres postgres # grab gosu for easy step-down from root +RUN gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* \ - && curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \ + && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \ + && gpg --verify /usr/local/bin/gosu.asc \ + && rm /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && apt-get purge -y --auto-remove curl diff --git a/9.1/Dockerfile b/9.1/Dockerfile index b58fbdd6e7..8808c2a645 100644 --- a/9.1/Dockerfile +++ b/9.1/Dockerfile @@ -5,8 +5,12 @@ FROM debian:wheezy RUN groupadd -r postgres && useradd -r -g postgres postgres # grab gosu for easy step-down from root +RUN gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* \ - && curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \ + && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \ + && gpg --verify /usr/local/bin/gosu.asc \ + && rm /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && apt-get purge -y --auto-remove curl diff --git a/9.2/Dockerfile b/9.2/Dockerfile index 91bd7a326c..4c2e22f15b 100644 --- a/9.2/Dockerfile +++ b/9.2/Dockerfile @@ -5,8 +5,12 @@ FROM debian:wheezy RUN groupadd -r postgres && useradd -r -g postgres postgres # grab gosu for easy step-down from root +RUN gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* \ - && curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \ + && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \ + && gpg --verify /usr/local/bin/gosu.asc \ + && rm /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && apt-get purge -y --auto-remove curl diff --git a/9.3/Dockerfile b/9.3/Dockerfile index 487e748bd5..560d556d72 100644 --- a/9.3/Dockerfile +++ b/9.3/Dockerfile @@ -5,8 +5,12 @@ FROM debian:wheezy RUN groupadd -r postgres && useradd -r -g postgres postgres # grab gosu for easy step-down from root +RUN gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* \ - && curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \ + && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \ + && gpg --verify /usr/local/bin/gosu.asc \ + && rm /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && apt-get purge -y --auto-remove curl diff --git a/9.4/Dockerfile b/9.4/Dockerfile index fcf9b90bc8..9b21b3ffd6 100644 --- a/9.4/Dockerfile +++ b/9.4/Dockerfile @@ -5,8 +5,12 @@ FROM debian:wheezy RUN groupadd -r postgres && useradd -r -g postgres postgres # grab gosu for easy step-down from root +RUN gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* \ - && curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \ + && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \ + && gpg --verify /usr/local/bin/gosu.asc \ + && rm /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && apt-get purge -y --auto-remove curl diff --git a/Dockerfile.template b/Dockerfile.template index 9d86078a9f..49f9fad51e 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -5,8 +5,12 @@ FROM debian:wheezy RUN groupadd -r postgres && useradd -r -g postgres postgres # grab gosu for easy step-down from root +RUN gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* \ - && curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \ + && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \ + && gpg --verify /usr/local/bin/gosu.asc \ + && rm /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && apt-get purge -y --auto-remove curl