Skip to content

Commit 99e9b1b

Browse files
yosifkityosifkit
authored
Merge pull request #93 from infosiftr/trusted.gpg.d
Use "/etc/apt/trusted.gpg.d" instead of "apt-key adv"
2 parents b2dd0ba + b26cb74 commit 99e9b1b

File tree

4 files changed

+48
-12
lines changed

4 files changed

+48
-12
lines changed

‎10.0/Dockerfile‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,28 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
pwgen \
2828
&& rm -rf /var/lib/apt/lists/*
2929

30+
ENV GPG_KEYS \
3031
# Key fingerprint = 1993 69E5 404B D5FC 7D2F E43B CBCB 082A 1BB9 43DB
3132
# MariaDB Package Signing Key <[email protected]>
32-
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \
33+
199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \
3334
# pub 1024D/CD2EFD2A 2009-12-15
3435
# Key fingerprint = 430B DF5C 56E7 C94E 848E E60C 1C4C BDCD CD2E FD2A
3536
# uid Percona MySQL Development Team <[email protected]>
3637
# sub 2048g/2D607DAF 2009-12-15
37-
&& apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
38+
430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
3839
# pub 4096R/8507EFA5 2016-06-30
3940
# Key fingerprint = 4D1B B29D 63D9 8E42 2B21 13B1 9334 A25F 8507 EFA5
4041
# uid Percona MySQL Development Team (Packaging key) <[email protected]>
4142
# sub 4096R/4CAC6D72 2016-06-30
42-
&& apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5
43+
4D1BB29D63D98E422B2113B19334A25F8507EFA5
44+
RUN set -ex; \
45+
export GNUPGHOME="$(mktemp -d)"; \
46+
for key in $GPG_KEYS; do \
47+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
48+
done; \
49+
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
50+
rm -r "$GNUPGHOME"; \
51+
apt-key list
4352

4453
RUN echo "deb https://repo.percona.com/apt jessie main" > /etc/apt/sources.list.d/percona.list \
4554
&& { \

‎10.1/Dockerfile‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,28 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
pwgen \
2828
&& rm -rf /var/lib/apt/lists/*
2929

30+
ENV GPG_KEYS \
3031
# Key fingerprint = 1993 69E5 404B D5FC 7D2F E43B CBCB 082A 1BB9 43DB
3132
# MariaDB Package Signing Key <[email protected]>
32-
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \
33+
199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \
3334
# pub 1024D/CD2EFD2A 2009-12-15
3435
# Key fingerprint = 430B DF5C 56E7 C94E 848E E60C 1C4C BDCD CD2E FD2A
3536
# uid Percona MySQL Development Team <[email protected]>
3637
# sub 2048g/2D607DAF 2009-12-15
37-
&& apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
38+
430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
3839
# pub 4096R/8507EFA5 2016-06-30
3940
# Key fingerprint = 4D1B B29D 63D9 8E42 2B21 13B1 9334 A25F 8507 EFA5
4041
# uid Percona MySQL Development Team (Packaging key) <[email protected]>
4142
# sub 4096R/4CAC6D72 2016-06-30
42-
&& apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5
43+
4D1BB29D63D98E422B2113B19334A25F8507EFA5
44+
RUN set -ex; \
45+
export GNUPGHOME="$(mktemp -d)"; \
46+
for key in $GPG_KEYS; do \
47+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
48+
done; \
49+
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
50+
rm -r "$GNUPGHOME"; \
51+
apt-key list
4352

4453
RUN echo "deb https://repo.percona.com/apt jessie main" > /etc/apt/sources.list.d/percona.list \
4554
&& { \

‎5.5/Dockerfile‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,28 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
pwgen \
2828
&& rm -rf /var/lib/apt/lists/*
2929

30+
ENV GPG_KEYS \
3031
# Key fingerprint = 1993 69E5 404B D5FC 7D2F E43B CBCB 082A 1BB9 43DB
3132
# MariaDB Package Signing Key <[email protected]>
32-
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \
33+
199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \
3334
# pub 1024D/CD2EFD2A 2009-12-15
3435
# Key fingerprint = 430B DF5C 56E7 C94E 848E E60C 1C4C BDCD CD2E FD2A
3536
# uid Percona MySQL Development Team <[email protected]>
3637
# sub 2048g/2D607DAF 2009-12-15
37-
&& apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
38+
430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
3839
# pub 4096R/8507EFA5 2016-06-30
3940
# Key fingerprint = 4D1B B29D 63D9 8E42 2B21 13B1 9334 A25F 8507 EFA5
4041
# uid Percona MySQL Development Team (Packaging key) <[email protected]>
4142
# sub 4096R/4CAC6D72 2016-06-30
42-
&& apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5
43+
4D1BB29D63D98E422B2113B19334A25F8507EFA5
44+
RUN set -ex; \
45+
export GNUPGHOME="$(mktemp -d)"; \
46+
for key in $GPG_KEYS; do \
47+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
48+
done; \
49+
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
50+
rm -r "$GNUPGHOME"; \
51+
apt-key list
4352

4453
RUN echo "deb https://repo.percona.com/apt wheezy main" > /etc/apt/sources.list.d/percona.list \
4554
&& { \

‎Dockerfile.template‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,28 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
pwgen \
2828
&& rm -rf /var/lib/apt/lists/*
2929

30+
ENV GPG_KEYS \
3031
# Key fingerprint = 1993 69E5 404B D5FC 7D2F E43B CBCB 082A 1BB9 43DB
3132
# MariaDB Package Signing Key <[email protected]>
32-
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \
33+
199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \
3334
# pub 1024D/CD2EFD2A 2009-12-15
3435
# Key fingerprint = 430B DF5C 56E7 C94E 848E E60C 1C4C BDCD CD2E FD2A
3536
# uid Percona MySQL Development Team <[email protected]>
3637
# sub 2048g/2D607DAF 2009-12-15
37-
&& apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
38+
430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
3839
# pub 4096R/8507EFA5 2016-06-30
3940
# Key fingerprint = 4D1B B29D 63D9 8E42 2B21 13B1 9334 A25F 8507 EFA5
4041
# uid Percona MySQL Development Team (Packaging key) <[email protected]>
4142
# sub 4096R/4CAC6D72 2016-06-30
42-
&& apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5
43+
4D1BB29D63D98E422B2113B19334A25F8507EFA5
44+
RUN set -ex; \
45+
export GNUPGHOME="$(mktemp -d)"; \
46+
for key in $GPG_KEYS; do \
47+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
48+
done; \
49+
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
50+
rm -r "$GNUPGHOME"; \
51+
apt-key list
4352

4453
RUN echo "deb https://repo.percona.com/apt %%SUITE%% main" > /etc/apt/sources.list.d/percona.list \
4554
&& { \

0 commit comments

Comments
 (0)