2.x: Fixed composer-2.yml file in dockerfile

codeenigma · Mar 7, 2024 · 89c0f3c · 89c0f3c
1 parent 4ef9f07
commit 89c0f3c
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/docker-images/controller-devel/Dockerfile b/docker-images/controller-devel/Dockerfile
@@ -22,16 +22,30 @@ RUN \
 # Set up provision 2.x, and we keep 1.x for compatibility.
 RUN su - ce-dev -c "git clone --branch 1.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision"
 
+COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml
+
+RUN \
+  set -x && \
+  export DEBIAN_FRONTEND=noninteractive && \
+  apt-get update && \
+  su - ce-dev -c "/home/ce-dev/ansible/bin/ansible-playbook --extra-vars=\"{ansible_common_remote_group: ce-dev}\" /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/*
+
 RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision-2"
 
-COPY ./provision.yml /home/ce-dev/ce-provision-2/provision.yml
+COPY ./provision-2.yml /home/ce-dev/ce-provision-2/provision-2.yml
 
 RUN \
   set -x && \
   export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
-  su - ce-dev -c "/home/ce-dev/ansible/bin/ansible-playbook --extra-vars=\"{ansible_common_remote_group: ce-dev}\" /home/ce-dev/ce-provision-2/provision.yml" && \
-  rm /home/ce-dev/ce-provision-2/provision.yml && \
+  su - ce-dev -c "/home/ce-dev/ansible/bin/ansible-playbook --extra-vars=\"{ansible_common_remote_group: ce-dev}\" /home/ce-dev/ce-provision-2/provision-2.yml" && \
+  rm /home/ce-dev/ce-provision-2/provision-2.yml && \
   apt-get clean  && \
   rm -rf \
   /var/lib/apt/lists/* \