From 60d68bbdbba4b1d67815c184c09452eca75416df Mon Sep 17 00:00:00 2001 From: Jerome Sagnole Date: Wed, 1 Nov 2017 21:17:23 +0100 Subject: [PATCH] adding python3 --- dist/docker/builder/debian/jessie/i686/build-under-docker.sh | 1 + dist/docker/server/debian/jessie/x86_64/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dist/docker/builder/debian/jessie/i686/build-under-docker.sh b/dist/docker/builder/debian/jessie/i686/build-under-docker.sh index 4226dd58c..09025e04e 100755 --- a/dist/docker/builder/debian/jessie/i686/build-under-docker.sh +++ b/dist/docker/builder/debian/jessie/i686/build-under-docker.sh @@ -48,6 +48,7 @@ then fi msg_info "PREPARE BUILD" +# on 32bit, we need add option '-DWITH_SSE2=OFF' cd ${DIRBUILD}; cmake -DWITH_NEL=ON \ -DWITH_STATIC=ON \ -DWITH_STATIC_DRIVERS=ON \ diff --git a/dist/docker/server/debian/jessie/x86_64/Dockerfile b/dist/docker/server/debian/jessie/x86_64/Dockerfile index 90062b064..bd28931f1 100644 --- a/dist/docker/server/debian/jessie/x86_64/Dockerfile +++ b/dist/docker/server/debian/jessie/x86_64/Dockerfile @@ -27,7 +27,7 @@ RUN apt-get update ; \ apt-get install -y openssh-server sudo net-tools ; \ apt-get install -y lzma xdelta p7zip p7zip-full ; \ DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server ; \ - apt-get install -y apache2 php5 libapache2-mod-php5 php5-mysql apache2-utils php5-gd php5-imagick rrdtool screen mcrypt php5-mcrypt ; \ + apt-get install -y apache2 php5 libapache2-mod-php5 php5-mysql apache2-utils php5-gd php5-imagick rrdtool screen mcrypt php5-mcrypt python3 ; \ DEBIAN_FRONTEND=noninteractive apt-get install -y phpmyadmin