Python3 steps pr 1.x (#24)

* Fixing Dockerfile to install Ansible from pip.

* Installing boto3 from pip.

* Rogue 'i'.

* Updating ansible path.

* Wrong path.

* Set Python3 as default on controller.

* Adding Ansible galaxy var.

* Setting the base container to use python3 as default.

* Adding pip3 to base container.

* Moving to _domain_name to be consistent with other projects.

Author: gregharvey

docker-images/base/Dockerfile

@@ -39,6 +39,7 @@ RUN \
   python3-apt \
   python3-dev \
   python3-pycurl \
+  python3-pip \
   rsyslog \
   sudo \
   systemd \

docker-images/controller/Dockerfile

@@ -6,7 +6,6 @@ RUN \
   apt-get update && \
   apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew" && \
   apt-get install -y -o Dpkg::Options::="--force-confnew" \
-  python3-pip \
   git && \
   apt-get clean  && \
   pip3 install ansible boto3 && \

templates/drupal8/ce-dev/ansible/deploy.yml.j2

@@ -8,7 +8,7 @@
     - build_type: local
     - _env_type: dev
 {% raw %}
-    - domain_name: www.{{ project_name }}.local
+    - _domain_name: www.{{ project_name }}.local
     # Path to your project root. This must match the "volume" set in the docker-compose template.
     - deploy_path: /home/ce-dev/deploy/live.local
     # This actually does not take any backup, but is needed to populate settings.php.
@@ -27,7 +27,7 @@
             sanitize_command: "sql-sanitize"
             # Remove after initial pass, to avoid reinstalling Drupal.
             force_install: yes
-            base_url: "https://{{ domain_name }}"
+            base_url: "https://{{ _domain_name }}"
     # Composer command to run.
     - composer:
         command: install

templates/drupal8/ce-dev/ansible/provision.yml.j2

@@ -12,16 +12,16 @@
     - env_type: dev
     - nginx:
         domains:
-          - server_name: "{{ domain_name }}"
+          - server_name: "{{ _domain_name }}"
             access_log:  "/var/log/nginx-access.log"
             error_log:  "/var/log/nginx-error.log"
             error_log_level:  "notice"
             webroot:  "/home/ce-dev/deploy/live.local/web"
             project_type:  "drupal8"
             ssl:
-              domain: "{{ domain_name }}"
-              cert: "{{ _ce_dev_mkcert_base}}/{{ domain_name }}.pem"
-              key: "{{ _ce_dev_mkcert_base}}/{{ domain_name }}-key.pem"
+              domain: "{{ _domain_name }}"
+              cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
+              key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
               handling: "unmanaged"
             ratelimitingcrawlers: no
             is_default: yes