Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the entire home directory a volume. #21

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Make the entire home directory a volume. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3d2188
Make the entire home directory a volume. This is the data for aegir.
jonpugh Oct 21, 2016
02b0a0e
Don't install provision in main image.
jonpugh Oct 21, 2016
590a4b9
Run hosting-queued with the -v option
jonpugh Oct 21, 2016
7832031
removing the build of "local" and "test" images. We dont use those an…
jonpugh Oct 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -91,9 +92,8 @@ 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"]
CMD ["drush @hostmaster hosting-queued"]
CMD ["drush @hostmaster hosting-queued -v"]