cord-1342 removed zombies, just look at the flowers
Change-Id: I4e7fc9800c0b4cc03c5cb0529a4e085f59e6f263
diff --git a/provisioner/Dockerfile.release b/provisioner/Dockerfile.release
index f266c8b..188896c 100644
--- a/provisioner/Dockerfile.release
+++ b/provisioner/Dockerfile.release
@@ -16,8 +16,9 @@
# Base image information borrowed by official golang wheezy Dockerfile
RUN apk --update add ansible openssh-client sshpass curl py2-netaddr rsync
-RUN mkdir -p /root/.ssh /service
+RUN mkdir -p /root/.ssh /service /etc/ansible
COPY ssh-config /root/.ssh/config
+COPY ansible.cfg /etc/ansible/ansible.cfg
ADD entry-point /service/entry-point
LABEL org.label-schema.name="provisioner" \
diff --git a/provisioner/Makefile b/provisioner/Makefile
index 13e9d83..0a8bdcf 100644
--- a/provisioner/Makefile
+++ b/provisioner/Makefile
@@ -28,7 +28,7 @@
$(eval BUILD_ID := $(shell docker create $(IMAGE_NAME):$(BUILD_TAG)))
$(eval BINDIR := $(shell mktemp -d))
docker cp $(BUILD_ID):/service/$(BINARY) $(BINDIR)/$(BINARY)
- cp Dockerfile.release ssh-config $(BINDIR)
+ cp Dockerfile.release ssh-config ansible.cfg $(BINDIR)
docker build -f $(BINDIR)/Dockerfile.release -t $(IMAGE_NAME):$(PACKAGE_TAG) --label org.label-schema.build-date=$(BUILD_DATE) --label org.label-schema.vcs-ref=$(VCS_REF) --label org.label-schema.vcs-ref-date=$(VCS_REF_DATE) --label org.label-schema.version=$(VERSION) $(BINDIR)
docker rm -f $(BUILD_ID)
rm -r $(BINDIR)
diff --git a/provisioner/ansible.cfg b/provisioner/ansible.cfg
new file mode 100644
index 0000000..06a154a
--- /dev/null
+++ b/provisioner/ansible.cfg
@@ -0,0 +1,4 @@
+[ssh_connection]
+# Turn off connection sharing to prevent zombie processes from hanging around.
+# "Just look at the flowers"
+ssh_args = -C