From d599eb9ea258d64991d75110f906611f6f221b81 Mon Sep 17 00:00:00 2001 From: Starchy Date: Wed, 19 Oct 2016 17:07:36 -0700 Subject: [PATCH 01/31] 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/31] 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/31] 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/31] 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/31] 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/31] 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/31] 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/31] 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/31] 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/31] * 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/31] 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/31] 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/31] 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/31] * 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/31] 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/31] 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/31] 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/31] 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/31] 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 b492da2a3bb576a91894b31d0635280aea71049c Mon Sep 17 00:00:00 2001 From: Starchy Date: Mon, 28 Aug 2017 15:22:18 -0700 Subject: [PATCH 20/31] closing off port 22 --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a28a355..48066d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,3 @@ -# Pinned to 0.9.18 (Ubuntu 14.04 LTS) to enable PHP5 FROM phusion/baseimage MAINTAINER gabriel schubiner @@ -116,7 +115,7 @@ ADD ./assets/init.sh /etc/my_init.d/10_init.sh RUN chmod -R +x /etc/my_init.d/ # Ports -EXPOSE 22 80 443 +EXPOSE 80 443 # Volumes VOLUME /data From d62a00d5384278253bc32056f8bf5929439185aa Mon Sep 17 00:00:00 2001 From: Starchy Date: Mon, 28 Aug 2017 16:37:29 -0700 Subject: [PATCH 21/31] Fix uploadprogress build for PHP 7.0 --- Dockerfile | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 48066d2..2f37991 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM phusion/baseimage -MAINTAINER gabriel schubiner +MAINTAINER starchy grant # Installation RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -19,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 @@ -49,9 +50,20 @@ 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 + +# build uploadprogress from git for php7 compatibility +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 From fab139a33838ae407634a5e712ed4e77f9c0b5c8 Mon Sep 17 00:00:00 2001 From: Starchy Date: Tue, 12 Dec 2017 17:52:16 -0800 Subject: [PATCH 22/31] Switching upstream to my fork from phusion --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2f37991..e70d0fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/baseimage +FROM starchy/baseimage-docker MAINTAINER starchy grant # Installation From 28bea835ad0693a5d30525df358ac1bc28b49ebf Mon Sep 17 00:00:00 2001 From: Starchy Date: Thu, 29 Mar 2018 14:31:24 -0700 Subject: [PATCH 23/31] * Update to OpenAtrium 2.627 * Add signature verification of OpenAtrium download --- Dockerfile | 7 ++++++- README.md | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e70d0fe..fa54ca1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,8 +112,13 @@ RUN chmod +x /usr/bin/update_ssmtp.sh RUN /usr/bin/update_ssmtp.sh # Open Atrium +ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.627-core.tar.gz +ENV OATRIUM_DOWNLOAD_SHA256 4ba2ed50c9e3c8d9b8724c598fe4656e053b449c0447c4fc570afef2c5e907c9 RUN rm -f /var/www/html/* -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 +RUN curl -fsS "$OATRIUM_DOWNLOAD_URL" -o oatrium.tar.gz \ + && echo "$OATRIUM_DOWNLOAD_SHA256 oatrium.tar.gz" | sha256sum -c - \ + && tar -C /var/www/html -xzf oatrium.tar.gz --strip-components=1 \ + && rm -f oatrium.tar.gz # Services RUN mkdir /etc/service/memcached /etc/service/apache diff --git a/README.md b/README.md index cf48da9..ea7dbe8 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.618 +## OpenAtrium - ver. 2.627 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.618-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.627-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From 8bf3a6a0a114878a7b6b3dc7ff5be5948c10d1e4 Mon Sep 17 00:00:00 2001 From: Starchy Date: Tue, 1 May 2018 11:24:36 -0700 Subject: [PATCH 24/31] Update Openatrium to 2.628 --- Dockerfile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa54ca1..6ac1ab4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,8 +112,8 @@ RUN chmod +x /usr/bin/update_ssmtp.sh RUN /usr/bin/update_ssmtp.sh # Open Atrium -ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.627-core.tar.gz -ENV OATRIUM_DOWNLOAD_SHA256 4ba2ed50c9e3c8d9b8724c598fe4656e053b449c0447c4fc570afef2c5e907c9 +ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.628-core.tar.gz +ENV OATRIUM_DOWNLOAD_SHA256 64f40af171ee62a3753b8b4ab993d490086c0f74e4b370e2c80acf4fc9364a07 RUN rm -f /var/www/html/* RUN curl -fsS "$OATRIUM_DOWNLOAD_URL" -o oatrium.tar.gz \ && echo "$OATRIUM_DOWNLOAD_SHA256 oatrium.tar.gz" | sha256sum -c - \ diff --git a/README.md b/README.md index ea7dbe8..00a894d 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.627 +## OpenAtrium - ver. 2.628 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.627-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.628-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From 7e6c283e7f450b4439ea7a0a6c801b5a11816842 Mon Sep 17 00:00:00 2001 From: Starchy Date: Wed, 16 Jan 2019 15:48:20 -0800 Subject: [PATCH 25/31] Update to OA 2.633 --- Dockerfile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ac1ab4..f3e18d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,8 +112,8 @@ RUN chmod +x /usr/bin/update_ssmtp.sh RUN /usr/bin/update_ssmtp.sh # Open Atrium -ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.628-core.tar.gz -ENV OATRIUM_DOWNLOAD_SHA256 64f40af171ee62a3753b8b4ab993d490086c0f74e4b370e2c80acf4fc9364a07 +ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.633-core.tar.gz +ENV OATRIUM_DOWNLOAD_SHA256 9dd7d7460f32518bc79259ce2e6ce69b188292cbb747b142d875eddb3c550c43 RUN rm -f /var/www/html/* RUN curl -fsS "$OATRIUM_DOWNLOAD_URL" -o oatrium.tar.gz \ && echo "$OATRIUM_DOWNLOAD_SHA256 oatrium.tar.gz" | sha256sum -c - \ diff --git a/README.md b/README.md index 00a894d..9236d54 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.628 +## OpenAtrium - ver. 2.633 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.628-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.633-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From a008975c471d03047292eb95b2e550db2425c0e0 Mon Sep 17 00:00:00 2001 From: Starchy Date: Fri, 18 Jan 2019 11:11:11 -0800 Subject: [PATCH 26/31] Update to Open Atrium 2.634 --- Dockerfile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f3e18d0..c3891a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,8 +112,8 @@ RUN chmod +x /usr/bin/update_ssmtp.sh RUN /usr/bin/update_ssmtp.sh # Open Atrium -ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.633-core.tar.gz -ENV OATRIUM_DOWNLOAD_SHA256 9dd7d7460f32518bc79259ce2e6ce69b188292cbb747b142d875eddb3c550c43 +ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.634-core.tar.gz +ENV OATRIUM_DOWNLOAD_SHA256 d089e9c76566c8d2bccf1b56309d83b168ba86f9c8d0b7e6b32e576a12b5cdd5 RUN rm -f /var/www/html/* RUN curl -fsS "$OATRIUM_DOWNLOAD_URL" -o oatrium.tar.gz \ && echo "$OATRIUM_DOWNLOAD_SHA256 oatrium.tar.gz" | sha256sum -c - \ diff --git a/README.md b/README.md index 9236d54..b9c5f04 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.633 +## OpenAtrium - ver. 2.634 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.633-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.634-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From a926203bcf4e8ca7dd8499f98806fdaa64a46434 Mon Sep 17 00:00:00 2001 From: Starchy Date: Thu, 31 Jan 2019 16:58:48 -0800 Subject: [PATCH 27/31] Update Open Atrium to 2.635 --- Dockerfile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3891a9..f1b620a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,8 +112,8 @@ RUN chmod +x /usr/bin/update_ssmtp.sh RUN /usr/bin/update_ssmtp.sh # Open Atrium -ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.634-core.tar.gz -ENV OATRIUM_DOWNLOAD_SHA256 d089e9c76566c8d2bccf1b56309d83b168ba86f9c8d0b7e6b32e576a12b5cdd5 +ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.635-core.tar.gz +ENV OATRIUM_DOWNLOAD_SHA256 61b3096dd2cca103f3b2c9e833abc2760b3b135c59239fc01433d529fe046ee8 RUN rm -f /var/www/html/* RUN curl -fsS "$OATRIUM_DOWNLOAD_URL" -o oatrium.tar.gz \ && echo "$OATRIUM_DOWNLOAD_SHA256 oatrium.tar.gz" | sha256sum -c - \ diff --git a/README.md b/README.md index b9c5f04..ff2d973 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.634 +## OpenAtrium - ver. 2.635 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.634-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.635-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From 4bb6237eb6dc5c1445798189fed6877fcff9d23c Mon Sep 17 00:00:00 2001 From: Starchy Date: Tue, 2 Apr 2019 17:02:26 -0700 Subject: [PATCH 28/31] Update Open Atrium to 2.641 --- Dockerfile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f1b620a..707ae0d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,8 +112,8 @@ RUN chmod +x /usr/bin/update_ssmtp.sh RUN /usr/bin/update_ssmtp.sh # Open Atrium -ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.635-core.tar.gz -ENV OATRIUM_DOWNLOAD_SHA256 61b3096dd2cca103f3b2c9e833abc2760b3b135c59239fc01433d529fe046ee8 +ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.641-core.tar.gz +ENV OATRIUM_DOWNLOAD_SHA256 c8f3c9fa43fbc4032e248d549c2bec2d738c32db807dcbd008374b9be11aa0d7 RUN rm -f /var/www/html/* RUN curl -fsS "$OATRIUM_DOWNLOAD_URL" -o oatrium.tar.gz \ && echo "$OATRIUM_DOWNLOAD_SHA256 oatrium.tar.gz" | sha256sum -c - \ diff --git a/README.md b/README.md index ff2d973..87d79c4 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.635 +## OpenAtrium - ver. 2.641 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.635-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.641-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From 3898fe120526bbe46ceedfce7cf5768a9e3c521c Mon Sep 17 00:00:00 2001 From: Starchy Date: Wed, 8 May 2019 16:16:26 -0700 Subject: [PATCH 29/31] Update to 7.x-2.642 --- Dockerfile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 707ae0d..a73cb05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,8 +112,8 @@ RUN chmod +x /usr/bin/update_ssmtp.sh RUN /usr/bin/update_ssmtp.sh # Open Atrium -ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.641-core.tar.gz -ENV OATRIUM_DOWNLOAD_SHA256 c8f3c9fa43fbc4032e248d549c2bec2d738c32db807dcbd008374b9be11aa0d7 +ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.642-core.tar.gz +ENV OATRIUM_DOWNLOAD_SHA256 17133590ce31bdd82ff6268994e5404dc8f36dda2cf1769e929f41e2343aa90f RUN rm -f /var/www/html/* RUN curl -fsS "$OATRIUM_DOWNLOAD_URL" -o oatrium.tar.gz \ && echo "$OATRIUM_DOWNLOAD_SHA256 oatrium.tar.gz" | sha256sum -c - \ diff --git a/README.md b/README.md index 87d79c4..134871f 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.641 +## OpenAtrium - ver. 2.642 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.641-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.642-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From 3776064a8433617824b66cc45df6f92ae85d0ad5 Mon Sep 17 00:00:00 2001 From: Starchy Date: Wed, 15 May 2019 17:59:21 -0700 Subject: [PATCH 30/31] Update to Open Atrium 7-2.643 --- Dockerfile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a73cb05..5f898fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,8 +112,8 @@ RUN chmod +x /usr/bin/update_ssmtp.sh RUN /usr/bin/update_ssmtp.sh # Open Atrium -ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.642-core.tar.gz -ENV OATRIUM_DOWNLOAD_SHA256 17133590ce31bdd82ff6268994e5404dc8f36dda2cf1769e929f41e2343aa90f +ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.643-core.tar.gz +ENV OATRIUM_DOWNLOAD_SHA256 cb80a8362890aa8ce2b0ca4b8bf7f1400e21ab69adc6595da51379bae6d8542c RUN rm -f /var/www/html/* RUN curl -fsS "$OATRIUM_DOWNLOAD_URL" -o oatrium.tar.gz \ && echo "$OATRIUM_DOWNLOAD_SHA256 oatrium.tar.gz" | sha256sum -c - \ diff --git a/README.md b/README.md index 134871f..efb2f59 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.642 +## OpenAtrium - ver. 2.643 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.642-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.643-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to From 246a567d8382a166dd79235e26c0babb8626c801 Mon Sep 17 00:00:00 2001 From: Starchy Date: Thu, 30 May 2019 10:54:02 -0700 Subject: [PATCH 31/31] Update to Open Atrium 7.x-2.644 --- Dockerfile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f898fc..bfc7a30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,8 +112,8 @@ RUN chmod +x /usr/bin/update_ssmtp.sh RUN /usr/bin/update_ssmtp.sh # Open Atrium -ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.643-core.tar.gz -ENV OATRIUM_DOWNLOAD_SHA256 cb80a8362890aa8ce2b0ca4b8bf7f1400e21ab69adc6595da51379bae6d8542c +ENV OATRIUM_DOWNLOAD_URL https://ftp.drupal.org/files/projects/openatrium-7.x-2.644-core.tar.gz +ENV OATRIUM_DOWNLOAD_SHA256 8373f6f186445705974f3fe00929d409f246d9f1ab6e101bfd22df03231fade6 RUN rm -f /var/www/html/* RUN curl -fsS "$OATRIUM_DOWNLOAD_URL" -o oatrium.tar.gz \ && echo "$OATRIUM_DOWNLOAD_SHA256 oatrium.tar.gz" | sha256sum -c - \ diff --git a/README.md b/README.md index efb2f59..516f5e9 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.643 +## OpenAtrium - ver. 2.644 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.643-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` +`RUN curl https://ftp.drupal.org/files/projects/openatrium-7.x-2.644-core.tar.gz | tar xz -C /var/www/html --strip-components=1 ` to