Open p-col opened 9 years ago
@p-col here is a patch to make it work for the testing
branch:
diff --git docker/brain/Dockerfile docker/brain/Dockerfile
index a44c1e7..16e839f 100644
--- docker/brain/Dockerfile
+++ docker/brain/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir /tmp/install/
WORKDIR /tmp/install/
RUN apt-get update && apt-get -y install git
-RUN git clone https://github.com/quarkslab/irma-ansible.git
+RUN git clone https://github.com/quarkslab/irma-ansible.git && git checkout testing
WORKDIR /tmp/install/irma-ansible/
@@ -17,8 +17,8 @@ RUN ansible-galaxy install -r ansible-requirements.yml
ADD ./roles/quarkslab.irma_provisioning_common/tasks/main.yml roles/quarkslab.irma_provisioning_common/tasks/main.yml
ADD ./roles/quarkslab.nodejs/tasks/main.yml roles/quarkslab.nodejs/tasks/main.yml
-ADD ./playbooks/group_vars/frontend playbooks/group_vars/frontend
-ADD ./playbooks/group_vars/brain playbooks/group_vars/brain
+ADD ./playbooks/group_vars/frontend.yml playbooks/group_vars/frontend.yml
+ADD ./playbooks/group_vars/brain.yml playbooks/group_vars/brain.yml
ADD ./roles/quarkslab.pureftpd/tasks/install.yml roles/quarkslab.pureftpd/tasks/install.yml
ADD ./roles/quarkslab.pureftpd/tasks/main.yml roles/quarkslab.pureftpd/tasks/main.yml
ADD ./roles/quarkslab.pureftpd/tasks/package.yml roles/quarkslab.pureftpd/tasks/package.yml
diff --git docker/probe/Dockerfile docker/probe/Dockerfile
index e4daa08..528e414 100644
--- docker/probe/Dockerfile
+++ docker/probe/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir /tmp/install/
WORKDIR /tmp/install/
RUN apt-get update && apt-get -y install git
-RUN git clone https://github.com/quarkslab/irma-ansible.git
+RUN git clone https://github.com/quarkslab/irma-ansible.git && git checkout testing
WORKDIR /tmp/install/irma-ansible/
ADD hosts/irma ./hosts/irma
@@ -16,7 +16,7 @@ RUN ansible-galaxy install -r ansible-requirements.yml
ADD ./roles/quarkslab.irma_provisioning_common/tasks/main.yml roles/quarkslab.irma_provisioning_common/tasks/main.yml
ADD ./roles/quarkslab.nodejs/tasks/main.yml roles/quarkslab.nodejs/tasks/main.yml
-ADD ./playbooks/group_vars/frontend playbooks/group_vars/frontend
+ADD ./playbooks/group_vars/frontend.yml playbooks/group_vars/frontend.yml
ADD ./roles/quarkslab.pureftpd/tasks/install.yml roles/quarkslab.pureftpd/tasks/install.yml
ADD ./roles/quarkslab.pureftpd/tasks/main.yml roles/quarkslab.pureftpd/tasks/main.yml
ADD ./roles/quarkslab.pureftpd/tasks/package.yml roles/quarkslab.pureftpd/tasks/package.yml
@@ -56,4 +56,4 @@ ADD ./docker/probe/supervisord.conf /supervisord.conf
RUN chmod 755 /usr/local/uvscan/uvscan
ENV TERM dumb
-ENTRYPOINT ["/usr/local/bin/supervisord", "-c", "/supervisord.conf"]
\ No newline at end of file
+ENTRYPOINT ["/usr/local/bin/supervisord", "-c", "/supervisord.conf"]
This pull request allows to build docker images based on irma's ansible playbooks. In order to build a probe or brain/frontend image, just use the docker-build.sh script in this way: ./build-docker.sh probe|brain. The irma's hosts files for docker are located into the docker directory.