From d599eb9ea258d64991d75110f906611f6f221b81 Mon Sep 17 00:00:00 2001 From: Starchy Date: Wed, 19 Oct 2016 17:07:36 -0700 Subject: [PATCH 01/20] pin phusion to 0.9.18 to allow php5.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5c53884..89d12a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM phusion/baseimage +FROM phusion/baseimage:0.9.18 MAINTAINER gabriel schubiner # Installation From 1d930c61eec219468a61686bf6b98d4c12b6d050 Mon Sep 17 00:00:00 2001 From: Starchy Date: Wed, 19 Oct 2016 17:18:59 -0700 Subject: [PATCH 02/20] install drush from apt --- Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 89d12a3..e957e10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ python-pip \ mysql-client \ ssmtp \ - memcached + memcached \ + drush # Cron ADD ./assets/openatrium.cron.sh /etc/cron.hourly/openatrium @@ -93,11 +94,6 @@ RUN rm -f /etc/ssmtp/ssmtp.conf ADD ./assets/ssmtp.conf /etc/ssmtp/ssmtp.conf RUN chmod +x /usr/bin/update_ssmtp.sh && update_ssmtp.sh -# Drush install -RUN pear channel-discover pear.drush.org - -RUN pear install drush/drush - # Open Atrium RUN rm -f /var/www/html/* RUN curl http://ftp.drupal.org/files/projects/openatrium-7.x-2.33-core.tar.gz | tar xz -C /var/www/html --strip-components=1 From 29d3302ba53956e97d3d55093df39df033a23bf3 Mon Sep 17 00:00:00 2001 From: Starchy Date: Wed, 19 Oct 2016 17:22:10 -0700 Subject: [PATCH 03/20] Download Open Atrium over HTTPS --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e957e10..92ae3ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,7 +96,7 @@ RUN chmod +x /usr/bin/update_ssmtp.sh && update_ssmtp.sh # Open Atrium RUN rm -f /var/www/html/* -RUN curl http://ftp.drupal.org/files/projects/openatrium-7.x-2.33-core.tar.gz | tar xz -C /var/www/html --strip-components=1 +RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.33-core.tar.gz | tar xz -C /var/www/html --strip-components=1 # Services RUN mkdir /etc/service/memcached /etc/service/apache From 0f2bb5b995299316323e28f4ba4cf9106cb92a9e Mon Sep 17 00:00:00 2001 From: Starchy Date: Wed, 19 Oct 2016 17:25:10 -0700 Subject: [PATCH 04/20] update Open Atrium to 2.68 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 92ae3ad..0566cb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,7 +96,7 @@ RUN chmod +x /usr/bin/update_ssmtp.sh && update_ssmtp.sh # Open Atrium RUN rm -f /var/www/html/* -RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.33-core.tar.gz | tar xz -C /var/www/html --strip-components=1 +RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.68-core.tar.gz | tar xz -C /var/www/html --strip-components=1 # Services RUN mkdir /etc/service/memcached /etc/service/apache From f7089ad67b78829bf1e70ccd83390bab33361930 Mon Sep 17 00:00:00 2001 From: Starchy Date: Fri, 21 Oct 2016 16:25:34 -0700 Subject: [PATCH 05/20] update Open Atrium to 2.69 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0566cb8..b66f00b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,7 +96,7 @@ RUN chmod +x /usr/bin/update_ssmtp.sh && update_ssmtp.sh # Open Atrium RUN rm -f /var/www/html/* -RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.68-core.tar.gz | tar xz -C /var/www/html --strip-components=1 +RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.69-core.tar.gz | tar xz -C /var/www/html --strip-components=1 # Services RUN mkdir /etc/service/memcached /etc/service/apache From 872ef7697e165542948fdfccff399b7afb5151b6 Mon Sep 17 00:00:00 2001 From: Starchy Date: Fri, 21 Oct 2016 16:31:07 -0700 Subject: [PATCH 06/20] reflects new OA version and HTTPS downloads --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0a0c8bb..ab3d25e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This repo contains a working repository for Phase2's OpenAtrium, based on the Drupal CMS. -## OpenAtrium - ver. 2.30RC3 +## OpenAtrium - ver. 2.69 OpenAtrium is a pretty rad Drupal distribution, supported by Phase2, that makes it pretty easy to set up very flexible intranets/community sites with out-of-the-box support for maintaining a hierarchy of 'spaces' that can each be customized with calendars, tasks, discussion boards, and file sharing. User groups, teams, permissions, etc. all well supported. @@ -177,11 +177,11 @@ Last Note: 99% of this image is relevant to any Drupal 7 distribution, so if you You'll want to change this line: -`RUN curl http://ftp.drupal.org/files/projects/openatrium-7.x-2.30-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.69-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to -`RUN curl http://ftp.drupal.org/files/projects/-7.x--core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/-7.x--core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` I should probably take this piece out into the init.sh script, and make the distribution name and version specifiable by environment variables, so you could literally use this image for any Drupal 7 distribution without rebuilding it, but maybe later. From 42f549f42a1c759a07a5ccec7a6a29f05e9c0d19 Mon Sep 17 00:00:00 2001 From: Starchy Date: Thu, 3 Nov 2016 15:31:15 -0700 Subject: [PATCH 07/20] creates symlink for drush in /usr/local --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index b66f00b..18148ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,10 @@ ADD assets/apache.openatrium.conf /etc/apache2/sites-available/ RUN ln -s /etc/apache2/sites-available/apache.openatrium.conf /etc/apache2/sites-enabled/openatrium.conf RUN a2enmod rewrite +# Symlink for drush +RUN mkdir /usr/local/drush +RUN ln -s /usr/bin/drush /usr/local/drush/drush + # PHP Config ENV PHP_MEMORY_LIMIT 1024M ENV PHP_MAX_EXECUTION_TIME 900 From 8e9330ff95e9ffccb4df8f1abb5ad986d32fc629 Mon Sep 17 00:00:00 2001 From: Starchy Date: Fri, 4 Nov 2016 16:33:04 -0700 Subject: [PATCH 08/20] Updates Open Atrium to 7.x-2.611 --- Dockerfile | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 18148ca..59b4129 100644 --- a/Dockerfile +++ b/Dockerfile @@ -100,7 +100,7 @@ RUN chmod +x /usr/bin/update_ssmtp.sh && update_ssmtp.sh # Open Atrium RUN rm -f /var/www/html/* -RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.69-core.tar.gz | tar xz -C /var/www/html --strip-components=1 +RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.611-core.tar.gz | tar xz -C /var/www/html --strip-components=1 # Services RUN mkdir /etc/service/memcached /etc/service/apache diff --git a/README.md b/README.md index ab3d25e..28889d0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This repo contains a working repository for Phase2's OpenAtrium, based on the Drupal CMS. -## OpenAtrium - ver. 2.69 +## OpenAtrium - ver. 2.611 OpenAtrium is a pretty rad Drupal distribution, supported by Phase2, that makes it pretty easy to set up very flexible intranets/community sites with out-of-the-box support for maintaining a hierarchy of 'spaces' that can each be customized with calendars, tasks, discussion boards, and file sharing. User groups, teams, permissions, etc. all well supported. @@ -177,7 +177,7 @@ Last Note: 99% of this image is relevant to any Drupal 7 distribution, so if you You'll want to change this line: -`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.69-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.611-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From 308a02254853523f8ca92a49c9392d23432146bf Mon Sep 17 00:00:00 2001 From: Starchy Date: Mon, 7 Nov 2016 15:58:36 -0800 Subject: [PATCH 09/20] fix permissions for drupal files directory after site install --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 59b4129..a5f081e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,6 +112,7 @@ RUN chmod -R +x /etc/service/ # Init script ADD ./assets/init.sh /etc/my_init.d/10_init.sh RUN chmod -R +x /etc/my_init.d/ +RUN chown www-data /var/www/html/sites/default/files/ # Ports EXPOSE 22 80 443 From 896ecf1a45f57882551bec532c03c9b6d9e666c0 Mon Sep 17 00:00:00 2001 From: Starchy Date: Fri, 30 Dec 2016 14:09:33 -0800 Subject: [PATCH 10/20] * updates to OA 2.612 * removes broken chown command --- Dockerfile | 3 +-- README.md | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a5f081e..c62b013 100644 --- a/Dockerfile +++ b/Dockerfile @@ -100,7 +100,7 @@ RUN chmod +x /usr/bin/update_ssmtp.sh && update_ssmtp.sh # Open Atrium RUN rm -f /var/www/html/* -RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.611-core.tar.gz | tar xz -C /var/www/html --strip-components=1 +RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.612-core.tar.gz | tar xz -C /var/www/html --strip-components=1 # Services RUN mkdir /etc/service/memcached /etc/service/apache @@ -112,7 +112,6 @@ RUN chmod -R +x /etc/service/ # Init script ADD ./assets/init.sh /etc/my_init.d/10_init.sh RUN chmod -R +x /etc/my_init.d/ -RUN chown www-data /var/www/html/sites/default/files/ # Ports EXPOSE 22 80 443 diff --git a/README.md b/README.md index 28889d0..396b0ec 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This repo contains a working repository for Phase2's OpenAtrium, based on the Drupal CMS. -## OpenAtrium - ver. 2.611 +## OpenAtrium - ver. 2.612 OpenAtrium is a pretty rad Drupal distribution, supported by Phase2, that makes it pretty easy to set up very flexible intranets/community sites with out-of-the-box support for maintaining a hierarchy of 'spaces' that can each be customized with calendars, tasks, discussion boards, and file sharing. User groups, teams, permissions, etc. all well supported. @@ -177,7 +177,7 @@ Last Note: 99% of this image is relevant to any Drupal 7 distribution, so if you You'll want to change this line: -`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.611-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.612-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From 0c8ad1844223dcbc9cf341aed73ba56117617466 Mon Sep 17 00:00:00 2001 From: Starchy Date: Thu, 23 Mar 2017 14:26:43 -0700 Subject: [PATCH 11/20] update OpenAtrium to 2.614 --- Dockerfile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c62b013..14e92e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ - +# Pinned to 0.9.18 (Ubuntu 14.04 LTS) to enable PHP5 FROM phusion/baseimage:0.9.18 MAINTAINER gabriel schubiner @@ -100,7 +100,7 @@ RUN chmod +x /usr/bin/update_ssmtp.sh && update_ssmtp.sh # Open Atrium RUN rm -f /var/www/html/* -RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.612-core.tar.gz | tar xz -C /var/www/html --strip-components=1 +RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.614-core.tar.gz | tar xz -C /var/www/html --strip-components=1 # Services RUN mkdir /etc/service/memcached /etc/service/apache diff --git a/README.md b/README.md index 396b0ec..dba0652 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This repo contains a working repository for Phase2's OpenAtrium, based on the Drupal CMS. -## OpenAtrium - ver. 2.612 +## OpenAtrium - ver. 2.614 OpenAtrium is a pretty rad Drupal distribution, supported by Phase2, that makes it pretty easy to set up very flexible intranets/community sites with out-of-the-box support for maintaining a hierarchy of 'spaces' that can each be customized with calendars, tasks, discussion boards, and file sharing. User groups, teams, permissions, etc. all well supported. @@ -177,7 +177,7 @@ Last Note: 99% of this image is relevant to any Drupal 7 distribution, so if you You'll want to change this line: -`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.612-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.614-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From d4d04b216d8673d2d6ff926a4fda7ff8a99928a5 Mon Sep 17 00:00:00 2001 From: Starchy Date: Thu, 23 Mar 2017 14:27:17 -0700 Subject: [PATCH 12/20] include setting group ownership for files directory on restart --- assets/init.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/init.sh b/assets/init.sh index 49b4271..3396607 100644 --- a/assets/init.sh +++ b/assets/init.sh @@ -60,6 +60,7 @@ function restore_permissions { pushd sites find . -type d -name files -exec chmod 770 '{}' \; + find ./default/files -type d -exec chown -R www-data '{}' \; find ./default/files -type d -exec chmod 770 '{}' \; find ./default/files -type f -exec chmod 660 '{}' \; From 80a225a4425222e656f6e7d571e230b4562d9ea8 Mon Sep 17 00:00:00 2001 From: Starchy Date: Wed, 26 Apr 2017 15:02:20 -0700 Subject: [PATCH 13/20] Updates OpenAtrium to 2.615 --- Dockerfile | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14e92e5..18a39c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -100,7 +100,7 @@ RUN chmod +x /usr/bin/update_ssmtp.sh && update_ssmtp.sh # Open Atrium RUN rm -f /var/www/html/* -RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.614-core.tar.gz | tar xz -C /var/www/html --strip-components=1 +RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.615-core.tar.gz | tar xz -C /var/www/html --strip-components=1 # Services RUN mkdir /etc/service/memcached /etc/service/apache diff --git a/README.md b/README.md index dba0652..51ff02f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This repo contains a working repository for Phase2's OpenAtrium, based on the Drupal CMS. -## OpenAtrium - ver. 2.614 +## OpenAtrium - ver. 2.615 OpenAtrium is a pretty rad Drupal distribution, supported by Phase2, that makes it pretty easy to set up very flexible intranets/community sites with out-of-the-box support for maintaining a hierarchy of 'spaces' that can each be customized with calendars, tasks, discussion boards, and file sharing. User groups, teams, permissions, etc. all well supported. @@ -177,7 +177,7 @@ Last Note: 99% of this image is relevant to any Drupal 7 distribution, so if you You'll want to change this line: -`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.614-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.615-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From e92e4f52a4e67292a347ac534a77b85a0b703982 Mon Sep 17 00:00:00 2001 From: Starchy Date: Fri, 12 May 2017 17:25:45 -0700 Subject: [PATCH 14/20] * fixes ssmtp build * sets exposes_php = Off in php.ini --- Dockerfile | 3 ++- assets/update_php_vars.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 18a39c7..54eac59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,7 +96,8 @@ ENV SSMTP_AUTH_METHOD LOGIN ADD ./assets/update_ssmtp.sh /usr/bin/update_ssmtp.sh RUN rm -f /etc/ssmtp/ssmtp.conf ADD ./assets/ssmtp.conf /etc/ssmtp/ssmtp.conf -RUN chmod +x /usr/bin/update_ssmtp.sh && update_ssmtp.sh +RUN chmod +x /usr/bin/update_ssmtp.sh +RUN /usr/bin/update_ssmtp.sh # Open Atrium RUN rm -f /var/www/html/* diff --git a/assets/update_php_vars.sh b/assets/update_php_vars.sh index a6aa9e4..6863eb2 100644 --- a/assets/update_php_vars.sh +++ b/assets/update_php_vars.sh @@ -2,6 +2,7 @@ sed -i \ + -e "s/^expose_php.*\$/expose_php = Off/g" \ -e "s/^memory_limit.*\$/memory_limit = $PHP_MEMORY_LIMIT/g" \ -e "s/^max_execution_time.*\$/max_execution_time = $PHP_MAX_EXECUTION_TIME/g" \ -e "s/^session.save_handler.*\$/session.save_handler = $PHP_SESSION_SAVE_CACHE/g" \ From 724106a6c94e8cbbdee8618309299206f7e16c6b Mon Sep 17 00:00:00 2001 From: Starchy Date: Thu, 18 May 2017 13:33:29 -0700 Subject: [PATCH 15/20] Updates OpenAtrium to 7.x-2.616 --- Dockerfile | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 54eac59..10c7be9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -101,7 +101,7 @@ RUN /usr/bin/update_ssmtp.sh # Open Atrium RUN rm -f /var/www/html/* -RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.615-core.tar.gz | tar xz -C /var/www/html --strip-components=1 +RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.616-core.tar.gz | tar xz -C /var/www/html --strip-components=1 # Services RUN mkdir /etc/service/memcached /etc/service/apache diff --git a/README.md b/README.md index 51ff02f..6b04437 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This repo contains a working repository for Phase2's OpenAtrium, based on the Drupal CMS. -## OpenAtrium - ver. 2.615 +## OpenAtrium - ver. 2.616 OpenAtrium is a pretty rad Drupal distribution, supported by Phase2, that makes it pretty easy to set up very flexible intranets/community sites with out-of-the-box support for maintaining a hierarchy of 'spaces' that can each be customized with calendars, tasks, discussion boards, and file sharing. User groups, teams, permissions, etc. all well supported. @@ -177,7 +177,7 @@ Last Note: 99% of this image is relevant to any Drupal 7 distribution, so if you You'll want to change this line: -`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.615-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.616-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From 6782a4f0e7f46e3c731464c4f318f78d19ef56e9 Mon Sep 17 00:00:00 2001 From: Starchy Date: Mon, 12 Jun 2017 14:12:21 -0700 Subject: [PATCH 16/20] Adds apache security.conf with version disclosure controls --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 10c7be9..6f8249a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,7 @@ ADD ./assets/openatrium.cron.sh /etc/cron.hourly/openatrium RUN chmod +x /etc/cron.hourly/openatrium # Apache Cfg +ADD assets/apache.security.conf /etc/apache2/conf.d/ RUN rm -f /etc/apache2/sites-enabled/* ADD assets/apache.openatrium.conf /etc/apache2/sites-available/ RUN ln -s /etc/apache2/sites-available/apache.openatrium.conf /etc/apache2/sites-enabled/openatrium.conf From 67f5faf45bf80a0a74eea36ba3ad7c4b7ce82844 Mon Sep 17 00:00:00 2001 From: Starchy Date: Wed, 16 Aug 2017 16:59:07 -0700 Subject: [PATCH 17/20] turning off apache signatures --- assets/apache.security.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 assets/apache.security.conf diff --git a/assets/apache.security.conf b/assets/apache.security.conf new file mode 100644 index 0000000..498d147 --- /dev/null +++ b/assets/apache.security.conf @@ -0,0 +1,3 @@ +ServerTokens Prod +ServerSignature Off +TraceEnable Off From 169449d9710c7b3f778a991ba27587560375f98c Mon Sep 17 00:00:00 2001 From: Starchy Date: Fri, 18 Aug 2017 14:30:38 -0700 Subject: [PATCH 18/20] updating to 2.618, adding docker-compose.yml.example --- Dockerfile | 2 +- README.md | 4 ++-- docker-compose.yml.example | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 docker-compose.yml.example diff --git a/Dockerfile b/Dockerfile index 6f8249a..16c4101 100644 --- a/Dockerfile +++ b/Dockerfile @@ -102,7 +102,7 @@ RUN /usr/bin/update_ssmtp.sh # Open Atrium RUN rm -f /var/www/html/* -RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.616-core.tar.gz | tar xz -C /var/www/html --strip-components=1 +RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.618-core.tar.gz | tar xz -C /var/www/html --strip-components=1 # Services RUN mkdir /etc/service/memcached /etc/service/apache diff --git a/README.md b/README.md index 6b04437..cf48da9 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This repo contains a working repository for Phase2's OpenAtrium, based on the Drupal CMS. -## OpenAtrium - ver. 2.616 +## OpenAtrium - ver. 2.618 OpenAtrium is a pretty rad Drupal distribution, supported by Phase2, that makes it pretty easy to set up very flexible intranets/community sites with out-of-the-box support for maintaining a hierarchy of 'spaces' that can each be customized with calendars, tasks, discussion boards, and file sharing. User groups, teams, permissions, etc. all well supported. @@ -177,7 +177,7 @@ Last Note: 99% of this image is relevant to any Drupal 7 distribution, so if you You'll want to change this line: -`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.616-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.618-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to diff --git a/docker-compose.yml.example b/docker-compose.yml.example new file mode 100644 index 0000000..0ae1d01 --- /dev/null +++ b/docker-compose.yml.example @@ -0,0 +1,26 @@ +openatrium: + image: starchy/openatrium # not currently on dockerhub + links: + - mariadb + environment: + DB_NAME: openatrium + INSTALL_SITE: "false" # set to true for automatic install on first run only + MIGRATE_SITES_TO: /sites + volumes: + - ./sites:/sites + - ./ssmtp.conf:/etc/ssmtp/ssmtp.conf:ro + ports: + - "80:80" + restart: always + +mariadb: + image: mariadb:10.2 + environment: + MYSQL_DATABASE: openatrium + MYSQL_USER: openatrium + MYSQL_PASSWORD: changeme + MYSQL_ROOT_PASSWORD: changemetoo + volumes: + - ./mysql:/var/lib/mysql + restart: always + From 58e981629b34cb0ec5557b8929189f9f889c46f0 Mon Sep 17 00:00:00 2001 From: Starchy Date: Mon, 21 Aug 2017 16:06:07 -0700 Subject: [PATCH 19/20] Update to php 7.0 and phusion/baseimage:latest --- Dockerfile | 28 ++++++++++++++-------------- assets/update_php_vars.sh | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 16c4101..a28a355 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,21 @@ # Pinned to 0.9.18 (Ubuntu 14.04 LTS) to enable PHP5 -FROM phusion/baseimage:0.9.18 +FROM phusion/baseimage MAINTAINER gabriel schubiner # Installation RUN apt-get update && apt-get install -y --no-install-recommends \ apache2 \ - libapache2-mod-php5 \ + libapache2-mod-php \ build-essential \ - php5 \ - php5-dev \ - php5-mysqlnd \ - php5-imap \ - php5-cli \ + php \ + php-dev \ + php-mysqlnd \ + php-imap \ + php-cli \ php-pear \ - php-apc \ - php5-gd \ - php5-memcached \ + php-apcu \ + php-gd \ + php-memcached \ python-pip \ mysql-client \ ssmtp \ @@ -45,14 +45,14 @@ ENV PHP_SENDMAIL_PATH /usr/sbin/ssmtp -t RUN sed -i \ -e 's/^;session.save_path/session.save_path/g' \ -e "s!^;sendmail_path =.*\$!sendmail_path = $PHP_SENDMAIL_PATH!g" \ - /etc/php5/apache2/php.ini + /etc/php/7.0/apache2/php.ini ADD ./assets/update_php_vars.sh /usr/bin/ RUN chmod +x /usr/bin/update_php_vars.sh RUN update_php_vars.sh -RUN php5enmod imap +RUN phpenmod imap RUN pecl install -Z uploadprogress && \ - echo 'extension=uploadprogress.so' >/etc/php5/mods-available/uploadprogress.ini && \ - php5enmod uploadprogress + echo 'extension=uploadprogress.so' >/etc/php/7.0/mods-available/uploadprogress.ini && \ + phpenmod uploadprogress # Default ENV vars ## Apache diff --git a/assets/update_php_vars.sh b/assets/update_php_vars.sh index 6863eb2..a6009a6 100644 --- a/assets/update_php_vars.sh +++ b/assets/update_php_vars.sh @@ -7,10 +7,10 @@ sed -i \ -e "s/^max_execution_time.*\$/max_execution_time = $PHP_MAX_EXECUTION_TIME/g" \ -e "s/^session.save_handler.*\$/session.save_handler = $PHP_SESSION_SAVE_CACHE/g" \ -e "s!^sendmail_path.*\$!sendmail_path = $PHP_SENDMAIL_PATH!g" \ - /etc/php5/apache2/php.ini + /etc/php/7.0/apache2/php.ini if [ "$PHP_SESSION_SAVE_CACHE" == "memcached" ]; then - sed -i -e "s!^session.save_path.*\$!session.save_path = \"localhost:11211\"!g" /etc/php5/apache2/php.ini + sed -i -e "s!^session.save_path.*\$!session.save_path = \"localhost:11211\"!g" /etc/php/7.0/apache2/php.ini else - sed -i -e "s!^session.save_path.*\$!session.save_path = \"/var/lib/php5\"!g" /etc/php5/apache2/php.ini + sed -i -e "s!^session.save_path.*\$!session.save_path = \"/var/lib/php\"!g" /etc/php/7.0/apache2/php.ini fi From 0dbcd0511a5cccc7aeccd1c323d489e37152eb0f Mon Sep 17 00:00:00 2001 From: Starchy Date: Thu, 24 Aug 2017 17:14:02 -0700 Subject: [PATCH 20/20] fix uploadprogress build for php 7 --- Dockerfile | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a28a355..ba36f7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ -# Pinned to 0.9.18 (Ubuntu 14.04 LTS) to enable PHP5 FROM phusion/baseimage -MAINTAINER gabriel schubiner +MAINTAINER Starchy Grant # Installation RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -20,7 +19,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ mysql-client \ ssmtp \ memcached \ - drush + drush \ + git # Cron ADD ./assets/openatrium.cron.sh /etc/cron.hourly/openatrium @@ -50,9 +50,17 @@ ADD ./assets/update_php_vars.sh /usr/bin/ RUN chmod +x /usr/bin/update_php_vars.sh RUN update_php_vars.sh RUN phpenmod imap -RUN pecl install -Z uploadprogress && \ - echo 'extension=uploadprogress.so' >/etc/php/7.0/mods-available/uploadprogress.ini && \ - phpenmod uploadprogress +RUN cd /root \ + && git clone https://github.com/Jan-E/uploadprogress.git \ + && cd uploadprogress \ + && phpize \ + && ./configure \ + && make \ + && make install \ + && echo 'extension=uploadprogress.so' >/etc/php/7.0/mods-available/uploadprogress.ini \ + && phpenmod uploadprogress \ + && cd \ + && rm -rf /root/uploadprogress # Default ENV vars ## Apache