Skip to content

Commit bac9a55

Browse files
committed
Adjust gpg code to kill daemons, cutting down on race conditions
1 parent aa2c42c commit bac9a55

File tree

4 files changed

+4
-0
lines changed

4 files changed

+4
-0
lines changed

3.2/32bit/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ RUN set -ex; \
2424
export GNUPGHOME="$(mktemp -d)"; \
2525
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
2626
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
27+
gpgconf --kill all; \
2728
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
2829
chmod +x /usr/local/bin/gosu; \
2930
gosu nobody true; \

3.2/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ RUN set -ex; \
2424
export GNUPGHOME="$(mktemp -d)"; \
2525
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
2626
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
27+
gpgconf --kill all; \
2728
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
2829
chmod +x /usr/local/bin/gosu; \
2930
gosu nobody true; \

4.0/32bit/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ RUN set -ex; \
2424
export GNUPGHOME="$(mktemp -d)"; \
2525
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
2626
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
27+
gpgconf --kill all; \
2728
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
2829
chmod +x /usr/local/bin/gosu; \
2930
gosu nobody true; \

4.0/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ RUN set -ex; \
2424
export GNUPGHOME="$(mktemp -d)"; \
2525
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
2626
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
27+
gpgconf --kill all; \
2728
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
2829
chmod +x /usr/local/bin/gosu; \
2930
gosu nobody true; \

0 commit comments

Comments
 (0)