Skip to content

Commit 0639d65

Browse files
Fix builds based on Debian Bookworm
They had 2 issues: * there is no `/etc/apt/sources.list` file anymore * the `npm` binary has its own APT package (it's not packaged with `nodejs` anymore)
1 parent 64baafa commit 0639d65

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

Dockerfile

+10-19
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ RUN set -eux; \
5959
\
6060
debian|ubuntu) \
6161
# Fix Jessie & Stretch APT sources (they have been moved to http://archive.debian.org)
62-
sed -i -r \
63-
-e '/(jessie|stretch)[-\/]updates/d' \
64-
-e 's|http://(deb\|httpredir).debian.org/debian (jessie\|stretch)|http://archive.debian.org/debian \2|' \
65-
/etc/apt/sources.list; \
62+
if [ -f /etc/apt/sources.list ]; then \
63+
sed -i -r \
64+
-e '/(jessie|stretch)[-\/]updates/d' \
65+
-e 's|http://(deb\|httpredir).debian.org/debian (jessie\|stretch)|http://archive.debian.org/debian \2|' \
66+
/etc/apt/sources.list; \
67+
fi; \
6668
\
6769
# Detect Debian version
6870
apt-get update; \
@@ -72,25 +74,13 @@ RUN set -eux; \
7274
; \
7375
debianReleaseCodename=$(lsb_release -cs); \
7476
\
75-
# Old Debian releases specific configurations
76-
case ${debianReleaseCodename} in \
77-
jessie) \
78-
additionalAptFlags="--force-yes"; \
79-
additionalAptPackages="libssl1.0.0"; \
80-
;; \
81-
*) \
82-
additionalAptFlags=""; \
83-
additionalAptPackages=""; \
84-
;; \
85-
esac; \
86-
\
8777
# Fix LetsEncrypt expired CA on older Debian releases
8878
case ${debianReleaseCodename} in \
8979
jessie|buster|stretch) \
90-
apt-get install --assume-yes --no-install-recommends --no-install-suggests ${additionalAptFlags} \
80+
apt-get install --assume-yes --no-install-recommends --no-install-suggests --force-yes \
9181
ca-certificates \
9282
curl \
93-
${additionalAptPackages} \
83+
$([ "${debianReleaseCodename}" = "jessie" ] && echo "libssl1.0.0") \
9484
; \
9585
sed -i 's|mozilla/DST_Root_CA_X3.crt|!mozilla/DST_Root_CA_X3.crt|g' /etc/ca-certificates.conf; \
9686
update-ca-certificates; \
@@ -113,10 +103,11 @@ RUN set -eux; \
113103
\
114104
# Install everything
115105
apt-get update; \
116-
apt-get install --assume-yes --no-install-recommends --no-install-suggests ${additionalAptFlags} \
106+
apt-get install --assume-yes --no-install-recommends --no-install-suggests --force-yes \
117107
jq \
118108
nano \
119109
nodejs \
110+
$([ "${debianReleaseCodename}" = "bookworm" ] && echo "npm") \
120111
postgresql-client \
121112
vim \
122113
; \

0 commit comments

Comments
 (0)