diff --git a/docker-images/controller-devel/Dockerfile b/docker-images/controller-devel/Dockerfile index 2bac8f2..1d102cc 100644 --- a/docker-images/controller-devel/Dockerfile +++ b/docker-images/controller-devel/Dockerfile @@ -6,10 +6,9 @@ RUN \ apt-get update && \ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew" && \ apt-get install -y -o Dpkg::Options::="--force-confnew" \ - git \ - python3-venv \ - python3-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/* \ @@ -24,11 +23,5 @@ COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml RUN \ set -x && \ export DEBIAN_FRONTEND=noninteractive && \ - su - ce-dev -c "/usr/bin/python3 -m venv /home/ce-dev/ansible" && \ - su - ce-dev -c "/home/ce-dev/ansible/bin/python3 -m pip install ansible" - -RUN \ - set -x && \ - export DEBIAN_FRONTEND=noninteractive && \ - su - ce-dev -c "/home/ce-dev/ansible/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 diff --git a/docker-images/controller/Dockerfile b/docker-images/controller/Dockerfile index 992f8b1..d3d4b11 100644 --- a/docker-images/controller/Dockerfile +++ b/docker-images/controller/Dockerfile @@ -6,10 +6,9 @@ RUN \ apt-get update && \ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew" && \ apt-get install -y -o Dpkg::Options::="--force-confnew" \ - git \ - python3-venv \ - python3-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/* \ @@ -24,11 +23,5 @@ COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml RUN \ set -x && \ export DEBIAN_FRONTEND=noninteractive && \ - su - ce-dev -c "/usr/bin/python3 -m venv /home/ce-dev/ansible" && \ - su - ce-dev -c "/home/ce-dev/ansible/bin/python3 -m pip install ansible" - -RUN \ - set -x && \ - export DEBIAN_FRONTEND=noninteractive && \ - su - ce-dev -c "/home/ce-dev/ansible/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