Issue #1356: Default to not installing Drupal inside the public Docke…

…r Hub image.
geerlingguy · May 14, 2017 · 64f0f6a · 64f0f6a
1 parent 8e814e9
commit 64f0f6a
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 21 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Jeff Geerling
 
 # Copy provisioning directory and vars files into container.
 COPY ./ /etc/ansible/drupal-vm
-COPY ./provisioning/docker/vars/overrides.yml /etc/ansible/drupal-vm/local.config.yml
+COPY ./provisioning/docker/vars/docker-hub-overrides.yml /etc/ansible/drupal-vm/local.config.yml
 
 # Provision Drupal VM inside Docker.
 RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml

diff --git a/example.docker-compose.yml b/example.docker-compose.yml
@@ -10,6 +10,7 @@ services:
  - 80:80
  - 443:443
  privileged: true
+ # Use of the `cached` option requires the Docker Edge release as of May '17.
  volumes:
  - ./:/var/www/drupalvm/:rw,cached
  command: /lib/systemd/systemd

diff --git a/provisioning/docker/Dockerfile-no-install b/provisioning/docker/Dockerfile-no-install
diff --git a/...ning/docker/vars/overrides-no-install.yml → ...ning/docker/vars/docker-hub-overrides.yml b/...ning/docker/vars/overrides-no-install.yml → ...ning/docker/vars/docker-hub-overrides.yml
diff --git a/provisioning/docker/vars/overrides.yml b/provisioning/docker/vars/overrides.yml