From b53c592ee11615b28dcb95a306ea9a44a4806a09 Mon Sep 17 00:00:00 2001 From: vsotirasqmplus Date: Fri, 27 Mar 2020 15:16:32 +0000 Subject: [PATCH 01/10] Added host network to enable connection to remote SSH tunneled ports --- moodlehost | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/moodlehost b/moodlehost index 7f57591..30c1cd4 100755 --- a/moodlehost +++ b/moodlehost @@ -178,14 +178,14 @@ then docker rm -f $dockername >/dev/null 2>/dev/null if [ "$filedir" == "" ] then - docker run -d -p ${port}:80 \ + docker run -d -p ${port}:80 --network host \ --name $dockername \ -v ${webroot}:/var/www/html \ -v ${moodledata}:/var/www/moodledata \ --add-host db_host:${db_host} \ qmulits/moodlehost:${php} else - docker run -d -p ${port}:80 \ + docker run -d -p ${port}:80 --network host \ --name $dockername \ -v ${webroot}:/var/www/html \ -v ${moodledata}:/var/www/moodledata \ From 3bc7760107ddb481cb39db370d41ab4a8e148cbd Mon Sep 17 00:00:00 2001 From: Vasileios Sotiras Date: Mon, 6 Apr 2020 16:31:24 +0100 Subject: [PATCH 02/10] Added mcrypt for PHP 7.2 --- dockerfiles/moodlehost-72/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dockerfiles/moodlehost-72/Dockerfile b/dockerfiles/moodlehost-72/Dockerfile index 0c93020..38ad728 100644 --- a/dockerfiles/moodlehost-72/Dockerfile +++ b/dockerfiles/moodlehost-72/Dockerfile @@ -16,6 +16,9 @@ RUN echo "xdebug.remote_enable=1" >> /usr/local/etc/php/php.ini && \ echo "xdebug.remote_port=9000" >> /usr/local/etc/php/php.ini && \ echo "xdebug.remote_host=172.17.0.1" >> /usr/local/etc/php/php.ini +RUN pecl update-channels && yes "" | pecl install -f channel://pecl.php.net/mcrypt-1.0.1 +RUN echo "extension=mcrypt.so" > /usr/local/etc/php/php.ini + #RUN ls /etc/init.d/apache2 RUN service apache2 start & From 5266d10d04ce5f1cb49b487b59d63b7c549705ba Mon Sep 17 00:00:00 2001 From: vasileios Date: Tue, 30 Jun 2020 12:18:01 +0100 Subject: [PATCH 03/10] Preserve logs during execution --- dockerfiles/moodlehost-72/.Dockerfile.swp | Bin 0 -> 12288 bytes moodlehost | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 dockerfiles/moodlehost-72/.Dockerfile.swp diff --git a/dockerfiles/moodlehost-72/.Dockerfile.swp b/dockerfiles/moodlehost-72/.Dockerfile.swp new file mode 100644 index 0000000000000000000000000000000000000000..e9558c58066f015adcc3f1a8fd323df5e86b0dce GIT binary patch literal 12288 zcmeI2&ubGw6vwBY6s?MiAYR543La)=cPrhtG(|zhB56x(y;v=i-D$IAv$Nfugtmx+ zSM{hz!9T#ipz8l1-o&E^kDm1En`BKJDd~?};VpdGY~GJ~^U0e)$g4RIXDig_Hwawk z3Hf>d<&(?XUr+vO5z>}<6st(*);8ek`SDz3ZI$u$W-I10;H^eq)U%$W2vu7&wGLxd z*SQg)4jL+3h1K$1Z!_N$w|kbpRQP}dkiek{43ja>b!^y3=^DLwVd>BrFaQZ40VIF~ zkN^@u0!RP}Ac5mcz@$UuIh22**us_KKJ?$cc*GkLKmter2_OL^fCP{L5-cj*t(ax1cwm7obVdRnYshglJF#x(@m=OvpRXGUyWM z%NasmgIiFnW3X(#2VwA3S|NjC6VEwD0~P3+bI>)H7%(Pqmn$*Nx2zho2lWsF3}k( zT6rd79mu#7pVm_W;*h5ko2nqDtu&NIv7j!KM8Qg#h!sqnhnb(KF^E z(X7)&EYS(uGCA`c*LQq(LKNk9+I(Oq*;@PBxEsklJ^{^YtwB2AoWS~R73;LA5;MT9 zlSrn9ttnHSD45QrZEnwmM;V2}Cz $dockername with PHP version $php (re-)started on port $port using ${webroot} as web root" fi From cf95e00bce78953e9bf50a5e9666951ccdb63d2e Mon Sep 17 00:00:00 2001 From: vasileios Date: Tue, 30 Jun 2020 12:43:48 +0100 Subject: [PATCH 04/10] Preserve logs and add servername to apache --- dockerfiles/moodlehost-72/.Dockerfile.swp | Bin 0 -> 12288 bytes moodlehost | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 dockerfiles/moodlehost-72/.Dockerfile.swp diff --git a/dockerfiles/moodlehost-72/.Dockerfile.swp b/dockerfiles/moodlehost-72/.Dockerfile.swp new file mode 100644 index 0000000000000000000000000000000000000000..e9558c58066f015adcc3f1a8fd323df5e86b0dce GIT binary patch literal 12288 zcmeI2&ubGw6vwBY6s?MiAYR543La)=cPrhtG(|zhB56x(y;v=i-D$IAv$Nfugtmx+ zSM{hz!9T#ipz8l1-o&E^kDm1En`BKJDd~?};VpdGY~GJ~^U0e)$g4RIXDig_Hwawk z3Hf>d<&(?XUr+vO5z>}<6st(*);8ek`SDz3ZI$u$W-I10;H^eq)U%$W2vu7&wGLxd z*SQg)4jL+3h1K$1Z!_N$w|kbpRQP}dkiek{43ja>b!^y3=^DLwVd>BrFaQZ40VIF~ zkN^@u0!RP}Ac5mcz@$UuIh22**us_KKJ?$cc*GkLKmter2_OL^fCP{L5-cj*t(ax1cwm7obVdRnYshglJF#x(@m=OvpRXGUyWM z%NasmgIiFnW3X(#2VwA3S|NjC6VEwD0~P3+bI>)H7%(Pqmn$*Nx2zho2lWsF3}k( zT6rd79mu#7pVm_W;*h5ko2nqDtu&NIv7j!KM8Qg#h!sqnhnb(KF^E z(X7)&EYS(uGCA`c*LQq(LKNk9+I(Oq*;@PBxEsklJ^{^YtwB2AoWS~R73;LA5;MT9 zlSrn9ttnHSD45QrZEnwmM;V2}Cz> /etc/apache2/apache2.conf + docker exec -it $dockername bash -c 'rm -f /var/log/apache2/*' + docker exec -it $dockername apachectl graceful echo "==> $dockername with PHP version $php (re-)started on port $port using ${webroot} as web root" fi From 2c36791a8573f7a6c84b940cb34dda9c82cc4901 Mon Sep 17 00:00:00 2001 From: vasileios Date: Tue, 30 Jun 2020 12:46:48 +0100 Subject: [PATCH 05/10] Preserve logs and add servername to apache --- moodlehost | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moodlehost b/moodlehost index d3ac578..51a78d6 100755 --- a/moodlehost +++ b/moodlehost @@ -193,7 +193,7 @@ then --add-host db_host:${db_host} \ qmulits/moodlehost:${php} fi - echo 'ServerName moodle' >> /etc/apache2/apache2.conf + docker exec -it $dockername bash -c "echo 'ServerName moodle' >> /etc/apache2/apache2.conf" docker exec -it $dockername bash -c 'rm -f /var/log/apache2/*' docker exec -it $dockername apachectl graceful echo "==> $dockername with PHP version $php (re-)started on port $port using ${webroot} as web root" From 4f2a407be8e0a74aef6a1ffee8ea238bb7bd86e8 Mon Sep 17 00:00:00 2001 From: vasileios Date: Tue, 30 Jun 2020 14:56:31 +0100 Subject: [PATCH 06/10] Preserve logs and add servername to apache --- moodlehost | 1 + 1 file changed, 1 insertion(+) diff --git a/moodlehost b/moodlehost index 51a78d6..c92f170 100755 --- a/moodlehost +++ b/moodlehost @@ -193,6 +193,7 @@ then --add-host db_host:${db_host} \ qmulits/moodlehost:${php} fi + docker exec -it $dockerfile bash -c "sed -i 's/time = 30/time = 3000/g' /usr/local/etc/php/php.ini" docker exec -it $dockername bash -c "echo 'ServerName moodle' >> /etc/apache2/apache2.conf" docker exec -it $dockername bash -c 'rm -f /var/log/apache2/*' docker exec -it $dockername apachectl graceful From 08e7ac3c499a0813346bf8fde6ecdec5c2984293 Mon Sep 17 00:00:00 2001 From: vasileios Date: Wed, 1 Jul 2020 12:28:55 +0100 Subject: [PATCH 07/10] Keep current logs in docker --- moodlehost | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moodlehost b/moodlehost index c92f170..8aa4810 100755 --- a/moodlehost +++ b/moodlehost @@ -193,7 +193,7 @@ then --add-host db_host:${db_host} \ qmulits/moodlehost:${php} fi - docker exec -it $dockerfile bash -c "sed -i 's/time = 30/time = 3000/g' /usr/local/etc/php/php.ini" + docker exec -it $dockername bash -c "sed -i 's/time = 30/time = 3000/g' /usr/local/etc/php/php.ini" docker exec -it $dockername bash -c "echo 'ServerName moodle' >> /etc/apache2/apache2.conf" docker exec -it $dockername bash -c 'rm -f /var/log/apache2/*' docker exec -it $dockername apachectl graceful From 4df7aa84fa6f395eaa4176803f83f8f309b914cc Mon Sep 17 00:00:00 2001 From: vasileios Date: Wed, 22 Jul 2020 12:39:34 +0100 Subject: [PATCH 08/10] More php memory 1G per worker --- dockerfiles/moodlehost-72/.Dockerfile.swp | Bin 12288 -> 0 bytes dockerfiles/moodlehost-72/Dockerfile | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 dockerfiles/moodlehost-72/.Dockerfile.swp diff --git a/dockerfiles/moodlehost-72/.Dockerfile.swp b/dockerfiles/moodlehost-72/.Dockerfile.swp deleted file mode 100644 index e9558c58066f015adcc3f1a8fd323df5e86b0dce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&ubGw6vwBY6s?MiAYR543La)=cPrhtG(|zhB56x(y;v=i-D$IAv$Nfugtmx+ zSM{hz!9T#ipz8l1-o&E^kDm1En`BKJDd~?};VpdGY~GJ~^U0e)$g4RIXDig_Hwawk z3Hf>d<&(?XUr+vO5z>}<6st(*);8ek`SDz3ZI$u$W-I10;H^eq)U%$W2vu7&wGLxd z*SQg)4jL+3h1K$1Z!_N$w|kbpRQP}dkiek{43ja>b!^y3=^DLwVd>BrFaQZ40VIF~ zkN^@u0!RP}Ac5mcz@$UuIh22**us_KKJ?$cc*GkLKmter2_OL^fCP{L5-cj*t(ax1cwm7obVdRnYshglJF#x(@m=OvpRXGUyWM z%NasmgIiFnW3X(#2VwA3S|NjC6VEwD0~P3+bI>)H7%(Pqmn$*Nx2zho2lWsF3}k( zT6rd79mu#7pVm_W;*h5ko2nqDtu&NIv7j!KM8Qg#h!sqnhnb(KF^E z(X7)&EYS(uGCA`c*LQq(LKNk9+I(Oq*;@PBxEsklJ^{^YtwB2AoWS~R73;LA5;MT9 zlSrn9ttnHSD45QrZEnwmM;V2}Cz> /usr/local/etc/php/php.ini && \ RUN pecl update-channels && yes "" | pecl install -f channel://pecl.php.net/mcrypt-1.0.1 RUN echo "extension=mcrypt.so" > /usr/local/etc/php/php.ini - +RUN sed -i 's/128M/1G/g' $(php -i|grep 'php.ini' | grep Loaded | grep -oE '[^ ]+$') #RUN ls /etc/init.d/apache2 RUN service apache2 start & From 810e6c0ee94299d15ee96d4b24e305c3f18bd737 Mon Sep 17 00:00:00 2001 From: vasileios Date: Wed, 16 Sep 2020 14:10:52 +0100 Subject: [PATCH 09/10] mcrypt for 7.3 --- dockerfiles/moodlehost-72/Dockerfile | 4 ++-- dockerfiles/moodlehost-73/Dockerfile | 4 +++- moodlehost.conf | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dockerfiles/moodlehost-72/Dockerfile b/dockerfiles/moodlehost-72/Dockerfile index 081d9da..b1bf7b8 100644 --- a/dockerfiles/moodlehost-72/Dockerfile +++ b/dockerfiles/moodlehost-72/Dockerfile @@ -17,8 +17,8 @@ RUN echo "xdebug.remote_enable=1" >> /usr/local/etc/php/php.ini && \ echo "xdebug.remote_host=172.17.0.1" >> /usr/local/etc/php/php.ini RUN pecl update-channels && yes "" | pecl install -f channel://pecl.php.net/mcrypt-1.0.1 -RUN echo "extension=mcrypt.so" > /usr/local/etc/php/php.ini -RUN sed -i 's/128M/1G/g' $(php -i|grep 'php.ini' | grep Loaded | grep -oE '[^ ]+$') +RUN echo "extension=mcrypt.so" >> /usr/local/etc/php/php.ini +RUN sed -i 's/128M/1G/g' /usr/local/etc/php/php.ini #RUN ls /etc/init.d/apache2 RUN service apache2 start & diff --git a/dockerfiles/moodlehost-73/Dockerfile b/dockerfiles/moodlehost-73/Dockerfile index 2e2d54e..7058a0a 100644 --- a/dockerfiles/moodlehost-73/Dockerfile +++ b/dockerfiles/moodlehost-73/Dockerfile @@ -16,7 +16,9 @@ RUN echo "xdebug.remote_enable=1" >> /usr/local/etc/php/php.ini && \ echo "xdebug.remote_port=9000" >> /usr/local/etc/php/php.ini && \ echo "xdebug.remote_host=172.17.0.1" >> /usr/local/etc/php/php.ini -#RUN ls /etc/init.d/apache2 +RUN pecl update-channels && yes "" | pecl install -f channel://pecl.php.net/mcrypt-1.0.1 +RUN echo "extension=mcrypt.so" >> /usr/local/etc/php/php.ini +RUN sed -i 's/128M/1G/g' /usr/local/etc/php/php.ini RUN service apache2 start & diff --git a/moodlehost.conf b/moodlehost.conf index e64f658..2032d68 100644 --- a/moodlehost.conf +++ b/moodlehost.conf @@ -4,7 +4,8 @@ export db_host=172.17.0.4 # if you want to map existing an existing moodlehost/filedir directory into moodlehost uncomment and edit the following line -#export filedir=/var/www/moodledata/filedir +# export filedir=/var/www/moodledata/filedir +export filedir=/mnt/USB4TB/moodledata/filedir # the IP port we are broadcasting on export port=80 From 15695b993d9e6500a7d811fb2a624bc08544a108 Mon Sep 17 00:00:00 2001 From: vasileios Date: Wed, 16 Sep 2020 14:24:03 +0100 Subject: [PATCH 10/10] mcrypt for 7.3 --- dockerfiles/moodlehost-73/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/dockerfiles/moodlehost-73/Dockerfile b/dockerfiles/moodlehost-73/Dockerfile index 7058a0a..b16a3b2 100644 --- a/dockerfiles/moodlehost-73/Dockerfile +++ b/dockerfiles/moodlehost-73/Dockerfile @@ -16,6 +16,7 @@ RUN echo "xdebug.remote_enable=1" >> /usr/local/etc/php/php.ini && \ echo "xdebug.remote_port=9000" >> /usr/local/etc/php/php.ini && \ echo "xdebug.remote_host=172.17.0.1" >> /usr/local/etc/php/php.ini +RUN yes "" | apt install mcrypt RUN pecl update-channels && yes "" | pecl install -f channel://pecl.php.net/mcrypt-1.0.1 RUN echo "extension=mcrypt.so" >> /usr/local/etc/php/php.ini RUN sed -i 's/128M/1G/g' /usr/local/etc/php/php.ini