Skip to content

Commit f7ba980

Browse files
tianontianon
committed
Update to gosu 1.12
1 parent d284e15 commit f7ba980

File tree

3 files changed

+63
-39
lines changed

3 files changed

+63
-39
lines changed

‎5.6/Dockerfile

+21-13
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,27 @@ RUN groupadd -r mysql && useradd -r -g mysql mysql
66
RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
77

88
# add gosu for easy step-down from root
9-
ENV GOSU_VERSION 1.7
10-
RUN set -x \
11-
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \
12-
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
13-
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
14-
&& export GNUPGHOME="$(mktemp -d)" \
15-
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
16-
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
17-
&& gpgconf --kill all \
18-
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
19-
&& chmod +x /usr/local/bin/gosu \
20-
&& gosu nobody true \
21-
&& apt-get purge -y --auto-remove ca-certificates wget
9+
# https://github.com/tianon/gosu/releases
10+
ENV GOSU_VERSION 1.12
11+
RUN set -eux; \
12+
savedAptMark="$(apt-mark showmanual)"; \
13+
apt-get update; \
14+
apt-get install -y --no-install-recommends ca-certificates wget; \
15+
rm -rf /var/lib/apt/lists/*; \
16+
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
17+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
18+
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
19+
export GNUPGHOME="$(mktemp -d)"; \
20+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
21+
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
22+
gpgconf --kill all; \
23+
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
24+
apt-mark auto '.*' > /dev/null; \
25+
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
26+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
27+
chmod +x /usr/local/bin/gosu; \
28+
gosu --version; \
29+
gosu nobody true
2230

2331
RUN mkdir /docker-entrypoint-initdb.d
2432

‎5.7/Dockerfile

+21-13
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,27 @@ RUN groupadd -r mysql && useradd -r -g mysql mysql
66
RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
77

88
# add gosu for easy step-down from root
9-
ENV GOSU_VERSION 1.7
10-
RUN set -x \
11-
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \
12-
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
13-
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
14-
&& export GNUPGHOME="$(mktemp -d)" \
15-
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
16-
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
17-
&& gpgconf --kill all \
18-
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
19-
&& chmod +x /usr/local/bin/gosu \
20-
&& gosu nobody true \
21-
&& apt-get purge -y --auto-remove ca-certificates wget
9+
# https://github.com/tianon/gosu/releases
10+
ENV GOSU_VERSION 1.12
11+
RUN set -eux; \
12+
savedAptMark="$(apt-mark showmanual)"; \
13+
apt-get update; \
14+
apt-get install -y --no-install-recommends ca-certificates wget; \
15+
rm -rf /var/lib/apt/lists/*; \
16+
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
17+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
18+
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
19+
export GNUPGHOME="$(mktemp -d)"; \
20+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
21+
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
22+
gpgconf --kill all; \
23+
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
24+
apt-mark auto '.*' > /dev/null; \
25+
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
26+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
27+
chmod +x /usr/local/bin/gosu; \
28+
gosu --version; \
29+
gosu nobody true
2230

2331
RUN mkdir /docker-entrypoint-initdb.d
2432

‎8.0/Dockerfile

+21-13
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,27 @@ RUN groupadd -r mysql && useradd -r -g mysql mysql
66
RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
77

88
# add gosu for easy step-down from root
9-
ENV GOSU_VERSION 1.7
10-
RUN set -x \
11-
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \
12-
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
13-
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
14-
&& export GNUPGHOME="$(mktemp -d)" \
15-
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
16-
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
17-
&& gpgconf --kill all \
18-
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
19-
&& chmod +x /usr/local/bin/gosu \
20-
&& gosu nobody true \
21-
&& apt-get purge -y --auto-remove ca-certificates wget
9+
# https://github.com/tianon/gosu/releases
10+
ENV GOSU_VERSION 1.12
11+
RUN set -eux; \
12+
savedAptMark="$(apt-mark showmanual)"; \
13+
apt-get update; \
14+
apt-get install -y --no-install-recommends ca-certificates wget; \
15+
rm -rf /var/lib/apt/lists/*; \
16+
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
17+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
18+
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
19+
export GNUPGHOME="$(mktemp -d)"; \
20+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
21+
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
22+
gpgconf --kill all; \
23+
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
24+
apt-mark auto '.*' > /dev/null; \
25+
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
26+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
27+
chmod +x /usr/local/bin/gosu; \
28+
gosu --version; \
29+
gosu nobody true
2230

2331
RUN mkdir /docker-entrypoint-initdb.d
2432

0 commit comments

Comments
 (0)