From f7b412dfc7c15f2fa5d3b98fa328da7c56c1ac4b Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 25 Dec 2018 11:40:50 +0100 Subject: [PATCH 01/15] Add docker-entry --- Dockerfile | 7 +++---- docker-entry.sh | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 docker-entry.sh diff --git a/Dockerfile b/Dockerfile index 6e06df6..d3aed4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,4 @@ -#FROM owncloud:10.0.4 -FROM nextcloud:12.0.4 -#FROM nextcloud:13 +FROM owncloud:10.0.10 RUN apt-get update && \ apt-get install -q -y cron && \ @@ -8,5 +6,6 @@ RUN apt-get update && \ RUN echo "*/15 * * * * root su -l www-data -s /bin/bash -c 'php -f /var/www/html/cron.php' > /dev/null 2>&1" >> /etc/crontab -CMD cron && apache2-foreground +COPY docker-entry.sh /docker-entry.sh +CMD /docker-entry.sh diff --git a/docker-entry.sh b/docker-entry.sh new file mode 100644 index 0000000..331518c --- /dev/null +++ b/docker-entry.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# Add htaccess configuration +cat >> /var/www/html/.htaccess < +ProxyPass /sites/ http://localhost/index.php/apps/cms_pico/pico/ +ProxyPassReverse /sites/ http://localhost/index.php/apps/cms_pico/pico/ + +MARK + +# Enable apache modules +a2enmod proxy rewrite + +# Run service +cron +exec apache2-foreground + From 5572602db9380c7621a11a9420860fb22b3d39c3 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 25 Dec 2018 11:44:12 +0100 Subject: [PATCH 02/15] Update permissions --- docker-entry.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker-entry.sh diff --git a/docker-entry.sh b/docker-entry.sh old mode 100644 new mode 100755 From fe1b4aff5f92d0bc0c7f1c209d548673ea8d0791 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 25 Dec 2018 12:23:21 +0100 Subject: [PATCH 03/15] Add another apache module --- docker-entry.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entry.sh b/docker-entry.sh index 331518c..585cc9d 100755 --- a/docker-entry.sh +++ b/docker-entry.sh @@ -9,7 +9,7 @@ ProxyPassReverse /sites/ http://localhost/index.php/apps/cms_pico/pico/ MARK # Enable apache modules -a2enmod proxy rewrite +a2enmod proxy proxy_http rewrite # Run service cron From 8dd0525cebfbe444ab4be57b2d7b5592ade6f13f Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 25 Dec 2018 12:23:52 +0100 Subject: [PATCH 04/15] Add vim & git --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d3aed4b..5b44c09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM owncloud:10.0.10 RUN apt-get update && \ - apt-get install -q -y cron && \ + apt-get install -q -y cron vim git && \ apt-get clean RUN echo "*/15 * * * * root su -l www-data -s /bin/bash -c 'php -f /var/www/html/cron.php' > /dev/null 2>&1" >> /etc/crontab From dbb440983859a7e5fd599e316ad8398051af830e Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Tue, 25 Dec 2018 19:08:16 +0100 Subject: [PATCH 05/15] Update apache proxy htaccess --- docker-entry.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-entry.sh b/docker-entry.sh index 585cc9d..e93b44c 100755 --- a/docker-entry.sh +++ b/docker-entry.sh @@ -3,8 +3,7 @@ # Add htaccess configuration cat >> /var/www/html/.htaccess < -ProxyPass /sites/ http://localhost/index.php/apps/cms_pico/pico/ -ProxyPassReverse /sites/ http://localhost/index.php/apps/cms_pico/pico/ +RewriteRule ^sites/(.*) http://127.0.0.1/index.php/apps/cms_pico/pico/$1 [P] MARK From 8c92eff659f3ffb9f52c2d05e60cafa519179e70 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Wed, 20 Nov 2019 17:33:31 +0100 Subject: [PATCH 06/15] Switch to nextcloud --- Dockerfile | 23 ++++++++++++++++------- docker-entry.sh | 16 ---------------- 2 files changed, 16 insertions(+), 23 deletions(-) delete mode 100755 docker-entry.sh diff --git a/Dockerfile b/Dockerfile index 5b44c09..4f18e7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,20 @@ -FROM owncloud:10.0.10 +#FROM owncloud:10.0.4 +FROM nextcloud:9 +#FROM nextcloud:12.0.4 +#FROM nextcloud:13.0.12 +#FROM nextcloud:16 +#FROM nextcloud:17 -RUN apt-get update && \ - apt-get install -q -y cron vim git && \ - apt-get clean +# RUN apt-get update && \ +# apt-get install -q -y cron && \ +# apt-get clean -RUN echo "*/15 * * * * root su -l www-data -s /bin/bash -c 'php -f /var/www/html/cron.php' > /dev/null 2>&1" >> /etc/crontab +# RUN echo "*/15 * * * * root su -l www-data -s /bin/bash -c 'php -f /var/www/html/cron.php' > /dev/null 2>&1" >> /etc/crontab -COPY docker-entry.sh /docker-entry.sh -CMD /docker-entry.sh +# CMD cron && apache2-foreground + +# Mandatory for bookmark extension +# but missing from deb packages +# RUN apt-get update \ +# && apt-get install -y php7.3-gmp diff --git a/docker-entry.sh b/docker-entry.sh deleted file mode 100755 index e93b44c..0000000 --- a/docker-entry.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -# Add htaccess configuration -cat >> /var/www/html/.htaccess < -RewriteRule ^sites/(.*) http://127.0.0.1/index.php/apps/cms_pico/pico/$1 [P] - -MARK - -# Enable apache modules -a2enmod proxy proxy_http rewrite - -# Run service -cron -exec apache2-foreground - From 94bfe71b8392270e094c2040c7a0c0a3d4c61326 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Wed, 20 Nov 2019 17:43:48 +0100 Subject: [PATCH 07/15] Add utils --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f18e7f..b58c17e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,9 @@ FROM nextcloud:9 #FROM nextcloud:16 #FROM nextcloud:17 -# RUN apt-get update && \ -# apt-get install -q -y cron && \ -# apt-get clean +RUN apt-get update && \ + apt-get install -q -y cron vim && \ + apt-get clean # RUN echo "*/15 * * * * root su -l www-data -s /bin/bash -c 'php -f /var/www/html/cron.php' > /dev/null 2>&1" >> /etc/crontab From c5f7cb3dd0a5124ec0566f89adeba87cec52cb34 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Wed, 20 Nov 2019 17:57:53 +0100 Subject: [PATCH 08/15] Switch to v10 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b58c17e..b3e502e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ #FROM owncloud:10.0.4 -FROM nextcloud:9 +FROM nextcloud:10 #FROM nextcloud:12.0.4 #FROM nextcloud:13.0.12 #FROM nextcloud:16 From e868a3b1c60ffbfa0e67e4e4da8be8f98f685ed3 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Wed, 20 Nov 2019 21:21:40 +0100 Subject: [PATCH 09/15] Bump to v11 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b3e502e..e2f16a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ #FROM owncloud:10.0.4 -FROM nextcloud:10 +#FROM nextcloud:10 +FROM nextcloud:11 #FROM nextcloud:12.0.4 #FROM nextcloud:13.0.12 #FROM nextcloud:16 From a23058077ef5830b2a88e897d8d32953ab361bbf Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Wed, 20 Nov 2019 23:42:12 +0100 Subject: [PATCH 10/15] Bump to v12 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e2f16a6..ece9487 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ #FROM owncloud:10.0.4 #FROM nextcloud:10 -FROM nextcloud:11 -#FROM nextcloud:12.0.4 +#FROM nextcloud:11 +FROM nextcloud:12 #FROM nextcloud:13.0.12 #FROM nextcloud:16 #FROM nextcloud:17 From be80e4b37d6c95fa42a1791a258f48ec2f957fcc Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 21 Nov 2019 00:09:23 +0100 Subject: [PATCH 11/15] Bump to v13 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ece9487..e0cdaad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ #FROM owncloud:10.0.4 #FROM nextcloud:10 #FROM nextcloud:11 -FROM nextcloud:12 -#FROM nextcloud:13.0.12 +#FROM nextcloud:12 +FROM nextcloud:13 #FROM nextcloud:16 #FROM nextcloud:17 From b712aa53f5e59fbfbca26761a38e60110f801c9c Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 21 Nov 2019 09:04:28 +0100 Subject: [PATCH 12/15] Bump to v14 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e0cdaad..de83c7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,8 @@ #FROM nextcloud:10 #FROM nextcloud:11 #FROM nextcloud:12 -FROM nextcloud:13 +#FROM nextcloud:13 +FROM nextcloud:14 #FROM nextcloud:16 #FROM nextcloud:17 From c97e25be465623e05f52de55d5770eeeae74d4d6 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 21 Nov 2019 09:16:00 +0100 Subject: [PATCH 13/15] Bump to v15 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index de83c7b..e7dc6bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,8 @@ #FROM nextcloud:11 #FROM nextcloud:12 #FROM nextcloud:13 -FROM nextcloud:14 +#FROM nextcloud:14 +FROM nextcloud:15 #FROM nextcloud:16 #FROM nextcloud:17 From 52103d68b215b2bb9ef7a84c19fe8dbda7102544 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 21 Nov 2019 09:43:12 +0100 Subject: [PATCH 14/15] Bump to v16 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e7dc6bb..736ee06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ #FROM nextcloud:12 #FROM nextcloud:13 #FROM nextcloud:14 -FROM nextcloud:15 -#FROM nextcloud:16 +#FROM nextcloud:15 +FROM nextcloud:16 #FROM nextcloud:17 RUN apt-get update && \ From 284dd7bce08b06fe49c032e4b8332b306770fae3 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Thu, 21 Nov 2019 10:09:21 +0100 Subject: [PATCH 15/15] Bump to v17 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 736ee06..ca0737c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ #FROM nextcloud:13 #FROM nextcloud:14 #FROM nextcloud:15 -FROM nextcloud:16 -#FROM nextcloud:17 +#FROM nextcloud:16 +FROM nextcloud:17 RUN apt-get update && \ apt-get install -q -y cron vim && \