Skip to content

Commit 2b928e4

Browse files
yarikopticyarikoptic
committed
Re-generated dockerfiles
1 parent efea570 commit 2b928e4

6 files changed

Lines changed: 102 additions & 14 deletions

File tree

‎dockerfiles/forky-non-free/Dockerfile‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Build #: +1
2+
FROM debian:forky
3+
4+
# https://bugs.debian.org/830696 (apt uses gpgv by default in newer releases, rather than gpg)
5+
RUN set -x \
6+
&& apt-get update \
7+
&& { \
8+
which gpg \
9+
|| apt-get install -y --no-install-recommends gnupg \
10+
; } \
11+
# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
12+
# so, if we're not running gnupg 1.x, explicitly install dirmngr too
13+
&& { \
14+
gpg --version | grep -q '^gpg (GnuPG) 1\.' \
15+
|| apt-get install -y --no-install-recommends dirmngr \
16+
; } \
17+
&& rm -rf /var/lib/apt/lists/*
18+
19+
# apt-key is a bit finicky during "docker build" with gnupg 2.x, so install the repo key the same way debian-archive-keyring does (/etc/apt/trusted.gpg.d)
20+
# this makes "apt-key list" output prettier too!
21+
RUN set -x \
22+
&& export GNUPGHOME="$(mktemp -d)" \
23+
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4E9A2E702A23C7C882574536439754ED1F42AA2C \
24+
&& mkdir -p /etc/apt/keyrings \
25+
&& gpg --batch --export --armor 4E9A2E702A23C7C882574536439754ED1F42AA2C > /etc/apt/keyrings/neurodebian.asc \
26+
&& rm -rf "$GNUPGHOME"
27+
28+
RUN { \
29+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian forky 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 forky main'; \
32+
} > /etc/apt/sources.list.d/neurodebian.sources.list
33+
34+
# Minimalistic package to assist with freezing the APT configuration
35+
# which would be coming from neurodebian repo.
36+
# Also install and enable eatmydata to be used for all apt-get calls
37+
# to speed up docker builds.
38+
RUN set -x \
39+
&& apt-get update \
40+
&& apt-get install -y --no-install-recommends neurodebian-freeze eatmydata \
41+
&& ln -s /usr/bin/eatmydata /usr/local/bin/apt-get \
42+
&& rm -rf /var/lib/apt/lists/*
43+
44+
RUN [ -e /etc/apt/sources.list.d/debian.sources ] && srcs=/etc/apt/sources.list.d/debian.sources || srcs=/etc/apt/sources.list; sed -i -e 's,main *$,main contrib non-free,g' /etc/apt/sources.list.d/neurodebian.sources.list $srcs

dockerfiles/focal/Dockerfile renamed to dockerfiles/forky/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build #: +1
2-
FROM ubuntu:focal
2+
FROM debian:forky
33

44
# https://bugs.debian.org/830696 (apt uses gpgv by default in newer releases, rather than gpg)
55
RUN set -x \
@@ -20,15 +20,15 @@ RUN set -x \
2020
# this makes "apt-key list" output prettier too!
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
23-
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
23+
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4E9A2E702A23C7C882574536439754ED1F42AA2C \
2424
&& mkdir -p /etc/apt/keyrings \
25-
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
25+
&& gpg --batch --export --armor 4E9A2E702A23C7C882574536439754ED1F42AA2C > /etc/apt/keyrings/neurodebian.asc \
2626
&& rm -rf "$GNUPGHOME"
2727

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

3434
# Minimalistic package to assist with freezing the APT configuration

dockerfiles/focal-non-free/Dockerfile renamed to dockerfiles/plucky-non-free/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build #: +1
2-
FROM ubuntu:focal
2+
FROM ubuntu:plucky
33

44
# https://bugs.debian.org/830696 (apt uses gpgv by default in newer releases, rather than gpg)
55
RUN set -x \
@@ -20,15 +20,15 @@ RUN set -x \
2020
# this makes "apt-key list" output prettier too!
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
23-
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
23+
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4E9A2E702A23C7C882574536439754ED1F42AA2C \
2424
&& mkdir -p /etc/apt/keyrings \
25-
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
25+
&& gpg --batch --export --armor 4E9A2E702A23C7C882574536439754ED1F42AA2C > /etc/apt/keyrings/neurodebian.asc \
2626
&& rm -rf "$GNUPGHOME"
2727

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

3434
# Minimalistic package to assist with freezing the APT configuration

‎dockerfiles/plucky/Dockerfile‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Build #: +1
2+
FROM ubuntu:plucky
3+
4+
# https://bugs.debian.org/830696 (apt uses gpgv by default in newer releases, rather than gpg)
5+
RUN set -x \
6+
&& apt-get update \
7+
&& { \
8+
which gpg \
9+
|| apt-get install -y --no-install-recommends gnupg \
10+
; } \
11+
# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
12+
# so, if we're not running gnupg 1.x, explicitly install dirmngr too
13+
&& { \
14+
gpg --version | grep -q '^gpg (GnuPG) 1\.' \
15+
|| apt-get install -y --no-install-recommends dirmngr \
16+
; } \
17+
&& rm -rf /var/lib/apt/lists/*
18+
19+
# apt-key is a bit finicky during "docker build" with gnupg 2.x, so install the repo key the same way debian-archive-keyring does (/etc/apt/trusted.gpg.d)
20+
# this makes "apt-key list" output prettier too!
21+
RUN set -x \
22+
&& export GNUPGHOME="$(mktemp -d)" \
23+
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4E9A2E702A23C7C882574536439754ED1F42AA2C \
24+
&& mkdir -p /etc/apt/keyrings \
25+
&& gpg --batch --export --armor 4E9A2E702A23C7C882574536439754ED1F42AA2C > /etc/apt/keyrings/neurodebian.asc \
26+
&& rm -rf "$GNUPGHOME"
27+
28+
RUN { \
29+
echo 'deb [signed-by=/etc/apt/keyrings/neurodebian.asc] http://neuro.debian.net/debian plucky 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 plucky main'; \
32+
} > /etc/apt/sources.list.d/neurodebian.sources.list
33+
34+
# Minimalistic package to assist with freezing the APT configuration
35+
# which would be coming from neurodebian repo.
36+
# Also install and enable eatmydata to be used for all apt-get calls
37+
# to speed up docker builds.
38+
RUN set -x \
39+
&& apt-get update \
40+
&& apt-get install -y --no-install-recommends neurodebian-freeze eatmydata \
41+
&& ln -s /usr/bin/eatmydata /usr/local/bin/apt-get \
42+
&& rm -rf /var/lib/apt/lists/*
43+
44+

‎dockerfiles/sid-non-free/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ RUN set -x \
2020
# this makes "apt-key list" output prettier too!
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
23-
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
23+
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4E9A2E702A23C7C882574536439754ED1F42AA2C \
2424
&& mkdir -p /etc/apt/keyrings \
25-
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
25+
&& gpg --batch --export --armor 4E9A2E702A23C7C882574536439754ED1F42AA2C > /etc/apt/keyrings/neurodebian.asc \
2626
&& rm -rf "$GNUPGHOME"
2727

2828
RUN { \

‎dockerfiles/sid/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ RUN set -x \
2020
# this makes "apt-key list" output prettier too!
2121
RUN set -x \
2222
&& export GNUPGHOME="$(mktemp -d)" \
23-
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
23+
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4E9A2E702A23C7C882574536439754ED1F42AA2C \
2424
&& mkdir -p /etc/apt/keyrings \
25-
&& gpg --batch --export --armor DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/keyrings/neurodebian.asc \
25+
&& gpg --batch --export --armor 4E9A2E702A23C7C882574536439754ED1F42AA2C > /etc/apt/keyrings/neurodebian.asc \
2626
&& rm -rf "$GNUPGHOME"
2727

2828
RUN { \

0 commit comments

Comments
 (0)