Skip to content

Use "/etc/apt/trusted.gpg.d" instead of "apt-key adv" #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions 10.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,28 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
pwgen \
&& rm -rf /var/lib/apt/lists/*

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

RUN echo "deb https://repo.percona.com/apt jessie main" > /etc/apt/sources.list.d/percona.list \
&& { \
Expand Down
15 changes: 12 additions & 3 deletions 10.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,28 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
pwgen \
&& rm -rf /var/lib/apt/lists/*

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

RUN echo "deb https://repo.percona.com/apt jessie main" > /etc/apt/sources.list.d/percona.list \
&& { \
Expand Down
15 changes: 12 additions & 3 deletions 5.5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,28 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
pwgen \
&& rm -rf /var/lib/apt/lists/*

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

RUN echo "deb https://repo.percona.com/apt wheezy main" > /etc/apt/sources.list.d/percona.list \
&& { \
Expand Down
15 changes: 12 additions & 3 deletions Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,28 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
pwgen \
&& rm -rf /var/lib/apt/lists/*

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

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