Python3 steps pr 1.x (#23)

* 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.

Author: gregharvey

docker-images/base/Dockerfile

@@ -36,9 +36,9 @@ RUN \
   openssh-server \
   postfix \
   procmail \
-  python-apt \
-  python-dev \
-  python-pycurl \
+  python3-apt \
+  python3-dev \
+  python3-pycurl \
   rsyslog \
   sudo \
   systemd \
@@ -47,6 +47,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,14 @@ 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 \
+  python3-pip \
   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 +24,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