From 6584460e200dc370700a574d065ddb94f39d6e55 Mon Sep 17 00:00:00 2001 From: richard Date: Sun, 17 Feb 2019 17:26:25 -0500 Subject: [PATCH] update ansible images and script to use docker container --- dockerfiles/tasks/ansible/Dockerfile-2.0 | 7 +++---- dockerfiles/tasks/ansible/Dockerfile-2.4 | 4 +++- dockerfiles/tasks/ansible/Dockerfile-2.5 | 5 ++++- dockerfiles/tasks/ansible/Dockerfile-2.7 | 4 +++- dockerfiles/tasks/ansible/build.sh | 2 +- scripts/ansible.sh | 9 +++++++-- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dockerfiles/tasks/ansible/Dockerfile-2.0 b/dockerfiles/tasks/ansible/Dockerfile-2.0 index 97be1ac..f216aec 100644 --- a/dockerfiles/tasks/ansible/Dockerfile-2.0 +++ b/dockerfiles/tasks/ansible/Dockerfile-2.0 @@ -62,12 +62,11 @@ ENV ANSIBLE_SSH_PIPELINING True ENV PYTHONPATH /ansible/lib ENV PATH /ansible/bin:$PATH ENV ANSIBLE_LIBRARY /ansible/library +ENV ANSIBLE_FORCE_COLOR true WORKDIR /ansible/playbooks ENTRYPOINT ["ansible-playbook"] -RUN addgroup ansible \ - && adduser -h /home/ansible -u 1000 -S -G ansible ansible - -USER ansible +RUN mkdir -p /.ansible && chmod 777 /.ansible \ + && adduser -D -u 1000 user && mkdir -p /home/user/.ssh diff --git a/dockerfiles/tasks/ansible/Dockerfile-2.4 b/dockerfiles/tasks/ansible/Dockerfile-2.4 index c63381b..e8d7704 100644 --- a/dockerfiles/tasks/ansible/Dockerfile-2.4 +++ b/dockerfiles/tasks/ansible/Dockerfile-2.4 @@ -62,9 +62,11 @@ ENV ANSIBLE_SSH_PIPELINING True ENV PYTHONPATH /ansible/lib ENV PATH /ansible/bin:$PATH ENV ANSIBLE_LIBRARY /ansible/library +ENV ANSIBLE_FORCE_COLOR true WORKDIR /ansible/playbooks ENTRYPOINT ["ansible-playbook"] -RUN mkdir -p /.ansible && chmod 777 /.ansible +RUN mkdir -p /.ansible && chmod 777 /.ansible \ + && adduser -D -u 1000 user && mkdir -p /home/user/.ssh diff --git a/dockerfiles/tasks/ansible/Dockerfile-2.5 b/dockerfiles/tasks/ansible/Dockerfile-2.5 index 7836814..c17cc78 100644 --- a/dockerfiles/tasks/ansible/Dockerfile-2.5 +++ b/dockerfiles/tasks/ansible/Dockerfile-2.5 @@ -62,9 +62,12 @@ ENV ANSIBLE_SSH_PIPELINING True ENV PYTHONPATH /ansible/lib ENV PATH /ansible/bin:$PATH ENV ANSIBLE_LIBRARY /ansible/library +ENV ANSIBLE_SCP_IF_SSH=y +ENV ANSIBLE_FORCE_COLOR true WORKDIR /ansible/playbooks ENTRYPOINT ["ansible-playbook"] -RUN mkdir -p /.ansible && chmod 777 /.ansible +RUN mkdir -p /.ansible && chmod 777 /.ansible \ + && adduser -D -u 1000 user && mkdir -p /home/user/.ssh diff --git a/dockerfiles/tasks/ansible/Dockerfile-2.7 b/dockerfiles/tasks/ansible/Dockerfile-2.7 index 4bcb009..4491eeb 100644 --- a/dockerfiles/tasks/ansible/Dockerfile-2.7 +++ b/dockerfiles/tasks/ansible/Dockerfile-2.7 @@ -62,9 +62,11 @@ ENV ANSIBLE_SSH_PIPELINING True ENV PYTHONPATH /ansible/lib ENV PATH /ansible/bin:$PATH ENV ANSIBLE_LIBRARY /ansible/library +ENV ANSIBLE_FORCE_COLOR true WORKDIR /ansible/playbooks ENTRYPOINT ["ansible-playbook"] -RUN mkdir -p /.ansible && chmod 777 /.ansible +RUN mkdir -p /.ansible && chmod 777 /.ansible \ + && adduser -D -u 1000 user && mkdir -p /home/user/.ssh diff --git a/dockerfiles/tasks/ansible/build.sh b/dockerfiles/tasks/ansible/build.sh index bd06b3b..a584c8d 100755 --- a/dockerfiles/tasks/ansible/build.sh +++ b/dockerfiles/tasks/ansible/build.sh @@ -26,5 +26,5 @@ docker tag xaicorp/ansible:2.7 dkregistry.xai-corp.net:5000/xaicorp/ansible:2.7 docker push dkregistry.xai-corp.net:5000/xaicorp/ansible:2.7 docker tag xaicorp/ansible:2.5 xaicorp/ansible:latest -docker tag xaicorp/ansible:2.5 dkregistry.xai-corp.net:5000/xaicorp/ansible:latest +docker tag xaicorp/ansible:latest dkregistry.xai-corp.net:5000/xaicorp/ansible:latest docker push dkregistry.xai-corp.net:5000/xaicorp/ansible:latest diff --git a/scripts/ansible.sh b/scripts/ansible.sh index d84a2a3..43017c7 100644 --- a/scripts/ansible.sh +++ b/scripts/ansible.sh @@ -1,5 +1,10 @@ #!/bin/bash -# run ansible playbook to update name servers +docker run --rm -i\ + -v ~/.ssh:/home/user/.ssh \ + -u 1000 \ + -v ${PWD}:/opt/project \ + -w /opt/project \ + xaicorp/ansible:2.7 ${PLAYBOOK}.yml -i inventory.conf -u ansible + -ansible-playbook -vvv ${PLAYBOOK}.yml -i inventory.conf -u ansible