Skip to content

Commit bd3260d

Browse files
tianontianon
committed
Use /etc/apt/keyrings instead of apt-key
This follows the APT deprecation (and now removal) of `apt-key`. This still fails on sid and trixie thanks to the DSA1024 key being fully rejected now. 🙈 This also drops the EOL Debian Buster.
1 parent a3e8a5d commit bd3260d

18 files changed

Lines changed: 91 additions & 179 deletions

File tree

‎dockerfiles/bookworm-non-free/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ RUN set -x \
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
2323
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
24-
&& gpg --batch --export DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/trusted.gpg.d/neurodebian.gpg \
25-
&& rm -rf "$GNUPGHOME" \
26-
&& apt-key list | grep neurodebian
24+
&& mkdir -p /etc/apt/keyrings \
25+
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
26+
&& rm -rf "$GNUPGHOME"
2727

2828
RUN { \
29-
echo 'deb http://neuro.debian.net/debian bookworm main'; \
30-
echo 'deb http://neuro.debian.net/debian data main'; \
31-
echo '#deb-src http://neuro.debian.net/debian-devel bookworm main'; \
29+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian bookworm main'; \
30+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian data main'; \
31+
echo '#deb-src [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian-devel bookworm main'; \
3232
} > /etc/apt/sources.list.d/neurodebian.sources.list
3333

3434
# Minimalistic package to assist with freezing the APT configuration

‎dockerfiles/bookworm/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ RUN set -x \
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
2323
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
24-
&& gpg --batch --export DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/trusted.gpg.d/neurodebian.gpg \
25-
&& rm -rf "$GNUPGHOME" \
26-
&& apt-key list | grep neurodebian
24+
&& mkdir -p /etc/apt/keyrings \
25+
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
26+
&& rm -rf "$GNUPGHOME"
2727

2828
RUN { \
29-
echo 'deb http://neuro.debian.net/debian bookworm main'; \
30-
echo 'deb http://neuro.debian.net/debian data main'; \
31-
echo '#deb-src http://neuro.debian.net/debian-devel bookworm main'; \
29+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian bookworm main'; \
30+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian data main'; \
31+
echo '#deb-src [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian-devel bookworm main'; \
3232
} > /etc/apt/sources.list.d/neurodebian.sources.list
3333

3434
# Minimalistic package to assist with freezing the APT configuration

‎dockerfiles/bullseye-non-free/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ RUN set -x \
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
2323
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
24-
&& gpg --batch --export DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/trusted.gpg.d/neurodebian.gpg \
25-
&& rm -rf "$GNUPGHOME" \
26-
&& apt-key list | grep neurodebian
24+
&& mkdir -p /etc/apt/keyrings \
25+
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
26+
&& rm -rf "$GNUPGHOME"
2727

2828
RUN { \
29-
echo 'deb http://neuro.debian.net/debian bullseye main'; \
30-
echo 'deb http://neuro.debian.net/debian data main'; \
31-
echo '#deb-src http://neuro.debian.net/debian-devel bullseye main'; \
29+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian bullseye main'; \
30+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian data main'; \
31+
echo '#deb-src [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian-devel bullseye main'; \
3232
} > /etc/apt/sources.list.d/neurodebian.sources.list
3333

3434
# Minimalistic package to assist with freezing the APT configuration

‎dockerfiles/bullseye/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ RUN set -x \
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
2323
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
24-
&& gpg --batch --export DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/trusted.gpg.d/neurodebian.gpg \
25-
&& rm -rf "$GNUPGHOME" \
26-
&& apt-key list | grep neurodebian
24+
&& mkdir -p /etc/apt/keyrings \
25+
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
26+
&& rm -rf "$GNUPGHOME"
2727

2828
RUN { \
29-
echo 'deb http://neuro.debian.net/debian bullseye main'; \
30-
echo 'deb http://neuro.debian.net/debian data main'; \
31-
echo '#deb-src http://neuro.debian.net/debian-devel bullseye main'; \
29+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian bullseye main'; \
30+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian data main'; \
31+
echo '#deb-src [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian-devel bullseye main'; \
3232
} > /etc/apt/sources.list.d/neurodebian.sources.list
3333

3434
# Minimalistic package to assist with freezing the APT configuration

‎dockerfiles/buster-non-free/Dockerfile‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎dockerfiles/buster/Dockerfile‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎dockerfiles/focal-non-free/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ RUN set -x \
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
2323
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
24-
&& gpg --batch --export DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/trusted.gpg.d/neurodebian.gpg \
25-
&& rm -rf "$GNUPGHOME" \
26-
&& apt-key list | grep neurodebian
24+
&& mkdir -p /etc/apt/keyrings \
25+
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
26+
&& rm -rf "$GNUPGHOME"
2727

2828
RUN { \
29-
echo 'deb http://neuro.debian.net/debian focal main'; \
30-
echo 'deb http://neuro.debian.net/debian data main'; \
31-
echo '#deb-src http://neuro.debian.net/debian-devel focal main'; \
29+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian focal main'; \
30+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian data main'; \
31+
echo '#deb-src [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian-devel focal main'; \
3232
} > /etc/apt/sources.list.d/neurodebian.sources.list
3333

3434
# Minimalistic package to assist with freezing the APT configuration

‎dockerfiles/focal/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ RUN set -x \
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
2323
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
24-
&& gpg --batch --export DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/trusted.gpg.d/neurodebian.gpg \
25-
&& rm -rf "$GNUPGHOME" \
26-
&& apt-key list | grep neurodebian
24+
&& mkdir -p /etc/apt/keyrings \
25+
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
26+
&& rm -rf "$GNUPGHOME"
2727

2828
RUN { \
29-
echo 'deb http://neuro.debian.net/debian focal main'; \
30-
echo 'deb http://neuro.debian.net/debian data main'; \
31-
echo '#deb-src http://neuro.debian.net/debian-devel focal main'; \
29+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian focal main'; \
30+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian data main'; \
31+
echo '#deb-src [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian-devel focal main'; \
3232
} > /etc/apt/sources.list.d/neurodebian.sources.list
3333

3434
# Minimalistic package to assist with freezing the APT configuration

‎dockerfiles/jammy-non-free/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ RUN set -x \
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
2323
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
24-
&& gpg --batch --export DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/trusted.gpg.d/neurodebian.gpg \
25-
&& rm -rf "$GNUPGHOME" \
26-
&& apt-key list | grep neurodebian
24+
&& mkdir -p /etc/apt/keyrings \
25+
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
26+
&& rm -rf "$GNUPGHOME"
2727

2828
RUN { \
29-
echo 'deb http://neuro.debian.net/debian jammy main'; \
30-
echo 'deb http://neuro.debian.net/debian data main'; \
31-
echo '#deb-src http://neuro.debian.net/debian-devel jammy main'; \
29+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian jammy main'; \
30+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian data main'; \
31+
echo '#deb-src [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian-devel jammy main'; \
3232
} > /etc/apt/sources.list.d/neurodebian.sources.list
3333

3434
# Minimalistic package to assist with freezing the APT configuration

‎dockerfiles/jammy/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ RUN set -x \
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
2323
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
24-
&& gpg --batch --export DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/trusted.gpg.d/neurodebian.gpg \
25-
&& rm -rf "$GNUPGHOME" \
26-
&& apt-key list | grep neurodebian
24+
&& mkdir -p /etc/apt/keyrings \
25+
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
26+
&& rm -rf "$GNUPGHOME"
2727

2828
RUN { \
29-
echo 'deb http://neuro.debian.net/debian jammy main'; \
30-
echo 'deb http://neuro.debian.net/debian data main'; \
31-
echo '#deb-src http://neuro.debian.net/debian-devel jammy main'; \
29+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian jammy main'; \
30+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian data main'; \
31+
echo '#deb-src [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian-devel jammy main'; \
3232
} > /etc/apt/sources.list.d/neurodebian.sources.list
3333

3434
# Minimalistic package to assist with freezing the APT configuration

0 commit comments

Comments
 (0)