From d76ab46e07bd7bee62385db1633138ec1ff65ded Mon Sep 17 00:00:00 2001 From: Brian Stajkowski Date: Wed, 13 Jul 2016 09:56:44 -0700 Subject: [PATCH] Update Docker Images Docker image files updated with entrypoint and submodules for ansible to run correctly. Change-Id: I8de1ea5e3198009e2e7bfb8903bdfca986493778 --- infrastructure/docker/debian6/Dockerfile | 6 ++++-- infrastructure/docker/debian7/Dockerfile | 6 ++++-- infrastructure/docker/debian8/Dockerfile | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/infrastructure/docker/debian6/Dockerfile b/infrastructure/docker/debian6/Dockerfile index 9430796..7324cce 100644 --- a/infrastructure/docker/debian6/Dockerfile +++ b/infrastructure/docker/debian6/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get install -y python-pip python-dev libmysqlclient-dev rpm bzip2 wget g RUN pip install --upgrade cffi pyasn1 -RUN pip install virtualenv PyYAML jinja2 paramiko +RUN pip install virtualenv PyYAML jinja2 paramiko ansible==1.9.1 RUN git clone https://github.com/ansible/ansible.git @@ -18,10 +18,12 @@ RUN cd ansible RUN cd ansible && git checkout tags/v1.9.1-1 +RUN cd ansible && git submodule update --init --recursive + RUN cd ansible && make install RUN mkdir /etc/ansible RUN cd ansible && cp examples/ansible.cfg /etc/ansible/. -ENTRYPOINT /bin/bash \ No newline at end of file +ENTRYPOINT ["/bin/bash", "-c", "ansible-playbook -i localhost, /root/package-neutron.yaml"] \ No newline at end of file diff --git a/infrastructure/docker/debian7/Dockerfile b/infrastructure/docker/debian7/Dockerfile index c111735..bf01e70 100644 --- a/infrastructure/docker/debian7/Dockerfile +++ b/infrastructure/docker/debian7/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get install -y python-pip python-dev libmysqlclient-dev rpm bzip2 wget g RUN pip install --upgrade cffi pyasn1 -RUN pip install virtualenv PyYAML jinja2 paramiko +RUN pip install virtualenv PyYAML jinja2 paramiko ansible==1.9.1 RUN git clone https://github.com/ansible/ansible.git @@ -18,10 +18,12 @@ RUN cd ansible RUN cd ansible && git checkout tags/v1.9.1-1 +RUN cd ansible && git submodule update --init --recursive + RUN cd ansible && make install RUN mkdir /etc/ansible RUN cd ansible && cp examples/ansible.cfg /etc/ansible/. -ENTRYPOINT /bin/bash \ No newline at end of file +ENTRYPOINT ["/bin/bash", "-c", "ansible-playbook -i localhost, /root/package-neutron.yaml"] \ No newline at end of file diff --git a/infrastructure/docker/debian8/Dockerfile b/infrastructure/docker/debian8/Dockerfile index c2a5672..84afff7 100644 --- a/infrastructure/docker/debian8/Dockerfile +++ b/infrastructure/docker/debian8/Dockerfile @@ -18,10 +18,12 @@ RUN cd ansible RUN cd ansible && git checkout tags/v1.9.1-1 +RUN cd ansible && git submodule update --init --recursive + RUN cd ansible && make install RUN mkdir /etc/ansible RUN cd ansible && cp examples/ansible.cfg /etc/ansible/. -ENTRYPOINT /bin/bash \ No newline at end of file +ENTRYPOINT ["/bin/bash", "-c", "ansible-playbook -i localhost, /root/package-neutron.yaml"] \ No newline at end of file