diff --git a/docker/ansible-playbook.Dockerfile b/docker/Dockerfile similarity index 88% rename from docker/ansible-playbook.Dockerfile rename to docker/Dockerfile index a077bf6..10a820f 100644 --- a/docker/ansible-playbook.Dockerfile +++ b/docker/Dockerfile @@ -15,4 +15,4 @@ RUN mkdir /data COPY scripts /scripts COPY playbook-sample-project /project -ENTRYPOINT ["python3", "/scripts/run-ansible-playbook.py"] +ENTRYPOINT ["python3", "/scripts/run.py"] diff --git a/docker/docker-run-ansible-playbook-local.sh b/docker/docker-run-ansible-local.sh similarity index 75% rename from docker/docker-run-ansible-playbook-local.sh rename to docker/docker-run-ansible-local.sh index 2142623..e31e9be 100755 --- a/docker/docker-run-ansible-playbook-local.sh +++ b/docker/docker-run-ansible-local.sh @@ -1,8 +1,9 @@ #/bin/bash -source docker/docker-run-ansible-playbook-local.env.local +source docker/docker-run-ansible-local.env.local + docker build docker \ - -f docker/ansible-playbook.Dockerfile \ + -f docker/Dockerfile \ -t ${IMAGE_NAME} docker run --rm \ diff --git a/docker/scripts/run-ansible-playbook.py b/docker/scripts/run.py similarity index 98% rename from docker/scripts/run-ansible-playbook.py rename to docker/scripts/run.py index c7ac387..63386ea 100644 --- a/docker/scripts/run-ansible-playbook.py +++ b/docker/scripts/run.py @@ -60,8 +60,6 @@ def build_cmdLine_args(rc): print(os.environ.get('ANSIBLE_VERBOSE')) print("---------------------------------------") rc.cmdline_args += " -vvv" - - rc.cmdline_args += " -vvv" def execute_playbook(projectdir):