Python3 steps pr devel (#22)

* 1.x dev (#19)

* Contribute docs (#12)

* Staging 1.1.10 release to test CI.

* Starting some contributor docs.

* Minor change to tag deletion.

* Making separate CI file for PR tests. (#14)

* Updating domain_name to _domain_name.

* Adding _domain_name var to blank template too.

* Updating _domain_name var for controller.

* env_type also becomes _env_type.

* Adding _env_type to blank template.

* Adding _env_type to drupal8 template.

* Adding _env_type to drupal8 deploy template.

* Adding _env_type to blank deploy template.

* Try adding _env_type directly to PHP CLI role vars.

* Explicitly adding fpm var required.

* Fixing Dockerfile to install Ansible from pip.

* Installing boto3 from pip.

* Rogue 'i'.

* 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

@@ -36,9 +36,10 @@ RUN \
   openssh-server \
   postfix \
   procmail \
-  python-apt \
-  python-dev \
-  python-pycurl \
+  python3-apt \
+  python3-dev \
+  python3-pycurl \
+  python3-pip \
   rsyslog \
   sudo \
   systemd \
@@ -47,6 +48,7 @@ RUN \
   vim \
   wget && \
   apt-get clean  && \
+  update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
   rm -rf \
   /var/lib/apt/lists/* \
   /var/log/* \

docker-images/controller/Dockerfile

@@ -3,15 +3,13 @@ FROM codeenigma/ce-dev-1.x:latest
 RUN \
   set -x && \
   export DEBIAN_FRONTEND=noninteractive && \  
-  echo 'deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main' > /etc/apt/sources.list.d/ansible.list && \
-  apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 && \
   apt-get update && \
   apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew" && \
   apt-get install -y -o Dpkg::Options::="--force-confnew" \
-  ansible \
-  python-boto3 \
   git && \
   apt-get clean  && \
+  pip3 install ansible boto3 && \
+  update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
   rm -rf \
   /var/lib/apt/lists/* \
   /var/log/* \
@@ -25,13 +23,11 @@ COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml
 RUN \
   set -x && \
   export DEBIAN_FRONTEND=noninteractive && \  
-  echo 'deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main' > /etc/apt/sources.list.d/ansible.list && \
-  apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 && \
   apt-get update && \
-  su - ce-dev -c "/usr/bin/ansible-playbook /home/ce-dev/ce-provision/provision.yml" && \
+  su - ce-dev -c "/usr/local/bin/ansible-playbook /home/ce-dev/ce-provision/provision.yml" && \
   rm /home/ce-dev/ce-provision/provision.yml && \
   apt-get clean  && \
   rm -rf \
   /var/lib/apt/lists/* \
   /var/log/* \
-  /tmp/*
+  /tmp/*

docker-images/controller/provision.yml

@@ -25,6 +25,7 @@
         username: ce-dev
         local_dir: /home/ce-dev/ce-provision
         groups: []
+        galaxy_custom_requirements_file: ""
   roles:
     - ce_provision
     - ce_deploy

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