From 9863fe71dcaa987ed28d70ac6873ece058344ab3 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Thu, 31 May 2018 09:37:38 -0400 Subject: [PATCH] do not require privileged iso container * The init call w/ privileged was causing my laptop to wig out. This changeset still functions w/ out requiring privileged access. --- tools/docker-isolated-override.yml | 4 +++- tools/docker-isolated/Dockerfile | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/docker-isolated-override.yml b/tools/docker-isolated-override.yml index 9f9d473def..55ff09e97d 100644 --- a/tools/docker-isolated-override.yml +++ b/tools/docker-isolated-override.yml @@ -14,4 +14,6 @@ services: - "../awx/main/expect:/awx_devel" - "../awx/lib:/awx_lib" - "/sys/fs/cgroup:/sys/fs/cgroup:ro" - privileged: true + tmpfs: + - "/tmp:exec" + - "/run" diff --git a/tools/docker-isolated/Dockerfile b/tools/docker-isolated/Dockerfile index 69af7526cc..53a8b67481 100644 --- a/tools/docker-isolated/Dockerfile +++ b/tools/docker-isolated/Dockerfile @@ -27,4 +27,7 @@ RUN ssh-keygen -A RUN mkdir -p /root/.ssh RUN touch /root/.ssh/authorized_keys +STOPSIGNAL SIGRTMIN+3 + + CMD ["/usr/sbin/init"]