Skip to content

Commit 86b1ab9

Browse files
committed
fix PHP 7.2 setup
Install `argon2` and `libghc-argon2-dev` for all PHPs but don't install `python-dev-is-python3` for PHP 7.2 where the debian version is 10 buster.
1 parent 95b75af commit 86b1ab9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

files/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ RUN apt-get install -y gdb valgrind libcurl4-openssl-dev pkg-config libpq-dev li
4040
#
4141
RUN apt-get update && apt-get install -y \
4242
autoconf \
43+
argon2 libghc-argon2-dev \
4344
autotools-dev \
4445
build-essential \
4546
bzip2 \
@@ -59,7 +60,6 @@ RUN apt-get update && apt-get install -y \
5960
make \
6061
perl \
6162
strace \
62-
python-dev-is-python3 \
6363
python3-yaml \
6464
sqlite3 \
6565
libsqlite3-dev \
@@ -81,10 +81,10 @@ RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
8181
RUN ln -s /usr/local/go/bin/go /usr/bin/go
8282

8383
#
84-
# If the debian version is jessie, don't install argon2
84+
# If the debian version is buster, don't install python-dev-is-python3
8585
#
86-
RUN if [ -z "$(grep '^8\.' /etc/debian_version)" ]; then \
87-
apt-get install -y argon2 libghc-argon2-dev; \
86+
RUN if [ -z "$(grep '^10\.' /etc/debian_version)" ]; then \
87+
apt-get install -y python-dev-is-python3; \
8888
fi
8989

9090
# install composer

0 commit comments

Comments
 (0)