Skip to content

Commit 19acf0d

Browse files
committed
Fix package install issues in Dockerfile.python3.delpoy to match .python3
1 parent 6e13f2f commit 19acf0d

File tree

1 file changed

+28
-29
lines changed

1 file changed

+28
-29
lines changed

Dockerfile.python3.deploy

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ ENV SWIG_FEATURES="-D__x86_64__"
1010
ENV OLYMPIA_UID=9500
1111
RUN useradd -u ${OLYMPIA_UID} -s /sbin/nologin olympia
1212

13+
# Update the main repositories to the archived repository
14+
RUN echo "deb http://archive.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list
15+
1316
# Add nodesource repository and requirements
1417
ADD docker/nodesource.gpg.key /etc/pki/gpg/GPG-KEY-nodesource
1518
RUN apt-get update && apt-get install -y \
@@ -20,45 +23,41 @@ RUN cat /etc/pki/gpg/GPG-KEY-nodesource | apt-key add -
2023
ADD docker/debian-stretch-nodesource-repo /etc/apt/sources.list.d/nodesource.list
2124
ADD docker/debian-stretch-backports-repo /etc/apt/sources.list.d/backports.list
2225

23-
RUN apt-get update && apt-get install -y \
26+
RUN apt-get update && apt-get install -y --allow-downgrades \
27+
# Downgrades
28+
libssl1.1=1.1.0l-1~deb9u1 \
2429
# General (dev-) dependencies
25-
bash-completion \
26-
build-essential \
27-
curl \
28-
libcap-dev \
29-
libjpeg-dev \
30-
libpcre3-dev \
31-
libsasl2-dev \
32-
libxml2-dev \
33-
libxslt-dev \
34-
locales \
35-
zlib1g-dev \
36-
libffi-dev \
37-
libmagic-dev \
38-
libssl-dev \
39-
nodejs \
40-
uuid-dev \
30+
bash-completion \
31+
build-essential \
32+
curl \
33+
libjpeg-dev \
34+
libsasl2-dev \
35+
libxml2-dev \
36+
libxslt-dev \
37+
locales \
38+
zlib1g-dev \
39+
libffi-dev \
40+
libssl-dev \
41+
libmagic-dev \
42+
nodejs \
4143
# Git, because we're using git-checkout dependencies
42-
git \
44+
git \
4345
# Dependencies for mysql-python
44-
mysql-client \
45-
default-libmysqlclient-dev \
46-
swig \
47-
gettext \
46+
mysql-client \
47+
default-libmysqlclient-dev \
48+
swig \
49+
gettext \
4850
# Use rsvg-convert to render our static theme previews
49-
librsvg2-bin \
51+
librsvg2-bin \
5052
# Use pngcrush to optimize the PNGs uploaded by developers
51-
pngcrush \
53+
pngcrush \
54+
# our makefile and ui-tests require uuid to be installed
55+
uuid \
5256
# Use libmaxmind for speedy geoip lookups
5357
libmaxminddb0 \
5458
libmaxminddb-dev \
5559
&& rm -rf /var/lib/apt/lists/*
5660

57-
RUN apt-get update && apt-get -t stretch-backports install -y \
58-
# For git-based files storage backend
59-
libgit2-dev \
60-
&& rm -rf /var/lib/apt/lists/*
61-
6261
# Compile required locale
6362
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
6463
ENV LANG en_US.UTF-8

0 commit comments

Comments
 (0)