Skip to content

Commit

Permalink
Split out tini build/install
Browse files Browse the repository at this point in the history
  • Loading branch information
justinrlee committed Feb 7, 2018
1 parent 9859943 commit 8534066
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,22 @@ ENV TINI_VERSION=v0.16.1 \
TINI_GPG_KEY=595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7
RUN set -x \
&& apt-get update && apt-get install -y --no-install-recommends dirmngr gpg wget \
&& rm -rf /var/lib/apt/lists/* \
&& wget -O tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-amd64" \
&& rm -rf /var/lib/apt/lists/*

RUN wget -O tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-amd64" \
&& wget -O tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-amd64.asc" \
&& export GNUPGHOME="$(mktemp -d)" \
&& gpg --recv-keys "$TINI_GPG_KEY" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$TINI_GPG_KEY" \
|| gpg --keyserver pool.sks-keyservers.net --recv-keys "$TINI_GPG_KEY" \
|| gpg --keyserver keyserver.pgp.com --recv-keys "$TINI_GPG_KEY" \
|| gpg --keyserver pgp.mit.edu --recv-keys "$TINI_GPG_KEY" \
&& gpg --batch --verify tini.asc tini \
&& rm -rf "$GNUPGHOME" tini.asc \
&& mv tini /usr/bin/tini \
&& chmod +x /usr/bin/tini \
&& tini -- true \
&& apt-get purge -y --auto-remove dirmngr gpg wget
&& tini -- true

RUN apt-get purge -y --auto-remove dirmngr gpg wget


ENV HAPROXY_MAJOR=1.8 \
Expand Down

0 comments on commit 8534066

Please sign in to comment.