From e3d21884af3a1a09574757402112bacf2e2faaba Mon Sep 17 00:00:00 2001
From: Jon Pugh <jon@thinkdrop.net>
Date: Fri, 21 Oct 2016 09:35:42 -0400
Subject: [PATCH 1/4] Make the entire home directory a volume. This is the data
 for aegir.

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ff9b91d..3d63307 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -91,8 +91,7 @@ ENV AEGIR_MAKEFILE http://cgit.drupalcode.org/provision/plain/aegir.make
 # For Releases:
 # ENV AEGIR_MAKEFILE http://cgit.drupalcode.org/provision/plain/aegir-release.make?h=$AEGIR_VERSION
 
-VOLUME /var/aegir/config
-VOLUME /var/aegir/.drush
+VOLUME /var/aegir
 
 # docker-entrypoint.sh waits for mysql and runs hostmaster install
 ENTRYPOINT ["docker-entrypoint.sh"]

From 02b0a0e621aebddd3cac32b63009e22b7e9de417 Mon Sep 17 00:00:00 2001
From: Jon Pugh <jon@thinkdrop.net>
Date: Fri, 21 Oct 2016 09:59:34 -0400
Subject: [PATCH 2/4] Don't install provision in main image.

---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3d63307..2dfb2f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -60,9 +60,10 @@ RUN chown aegir:aegir /var/log/aegir
 RUN echo 'Hello, Aegir.' > /var/log/aegir/system.log
 
 # Install Provision for all.
-ENV PROVISION_VERSION 7.x-3.x
-RUN mkdir -p /usr/share/drush/commands
-RUN drush dl --destination=/usr/share/drush/commands provision-$PROVISION_VERSION -y
+# @TODO: Let's only do this in release dockerfiles. It's problematic when images want to install their own provision. Drush won't pick up local provision sometimes.
+#ENV PROVISION_VERSION 7.x-3.x
+#RUN mkdir -p /usr/share/drush/commands
+#RUN drush dl --destination=/usr/share/drush/commands provision-$PROVISION_VERSION -y
 
 RUN drush dl --destination=/usr/share/drush/commands registry_rebuild-7.x -y
 

From 590a4b95781482283431869107ce5f5a4e8c207d Mon Sep 17 00:00:00 2001
From: Jon Pugh <jon@thinkdrop.net>
Date: Fri, 21 Oct 2016 10:06:53 -0400
Subject: [PATCH 3/4] Run hosting-queued with the -v option

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2dfb2f9..0b099a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -96,4 +96,4 @@ VOLUME /var/aegir
 
 # docker-entrypoint.sh waits for mysql and runs hostmaster install
 ENTRYPOINT ["docker-entrypoint.sh"]
-CMD ["drush @hostmaster hosting-queued"]
\ No newline at end of file
+CMD ["drush @hostmaster hosting-queued -v"]
\ No newline at end of file

From 78320318ff5f275dad798846586725532789fc91 Mon Sep 17 00:00:00 2001
From: Jon Pugh <jon@thinkdrop.net>
Date: Fri, 21 Oct 2016 10:09:58 -0400
Subject: [PATCH 4/4] removing the build of "local" and "test" images. We dont
 use those anymore

---
 .travis.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02251d0..8bbcce5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,15 +47,8 @@ before_install:
 
   - cd ..
 
-  # First build stock image, and one for own user.
+  # Build our image.
   - sudo docker build --rm -t aegir/hostmaster .
-  - sudo docker build --rm -t aegir/hostmaster:own --build-arg AEGIR_UID=1000 .
-
-  # Then build local image. Only difference is /var/aegir is volume.
-  - sudo docker build --rm -t aegir/hostmaster:local -f Dockerfile-local .
-
-  # Then build test image. Only difference is CMD defaults to run-tests.sh
-  - sudo docker build --rm -t aegir/hostmaster:test -f Dockerfile-test .
 
   # Go to tests/travis folder. Docker-compose files are in there.
   - cd tests/travis