From a5211510db96dd79bc05b26951e50a5f2ee38bff Mon Sep 17 00:00:00 2001 From: Adam Hill Date: Tue, 1 Jan 2019 14:46:34 -0600 Subject: [PATCH] Adding no-daemon opt back in which works with correct capabilities (NET_ADMIN) Signed-off-by: Adam Hill --- Dockerfile.template | 2 +- Dockerfile_aarch64 | 2 +- Dockerfile_amd64 | 2 +- Dockerfile_armel | 2 +- Dockerfile_armhf | 2 +- test/conftest.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index 0238f37..86e7d62 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -29,7 +29,7 @@ EXPOSE 443 ENV S6_LOGGING 0 ENV S6_KEEP_ENV 1 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 -ENV FTL_CMD debug +ENV FTL_CMD no-daemon ENV VERSION {{ pihole.version }} ENV ARCH {{ pihole.arch }} diff --git a/Dockerfile_aarch64 b/Dockerfile_aarch64 index b8b0239..8bf90f7 100644 --- a/Dockerfile_aarch64 +++ b/Dockerfile_aarch64 @@ -29,7 +29,7 @@ EXPOSE 443 ENV S6_LOGGING 0 ENV S6_KEEP_ENV 1 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 -ENV FTL_CMD debug +ENV FTL_CMD no-daemon ENV VERSION v4.1.1 ENV ARCH aarch64 diff --git a/Dockerfile_amd64 b/Dockerfile_amd64 index 148138a..e8ce0e4 100644 --- a/Dockerfile_amd64 +++ b/Dockerfile_amd64 @@ -29,7 +29,7 @@ EXPOSE 443 ENV S6_LOGGING 0 ENV S6_KEEP_ENV 1 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 -ENV FTL_CMD debug +ENV FTL_CMD no-daemon ENV VERSION v4.1.1 ENV ARCH amd64 diff --git a/Dockerfile_armel b/Dockerfile_armel index d6be046..d1535c4 100644 --- a/Dockerfile_armel +++ b/Dockerfile_armel @@ -29,7 +29,7 @@ EXPOSE 443 ENV S6_LOGGING 0 ENV S6_KEEP_ENV 1 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 -ENV FTL_CMD debug +ENV FTL_CMD no-daemon ENV VERSION v4.1.1 ENV ARCH armel diff --git a/Dockerfile_armhf b/Dockerfile_armhf index 806783a..da661e9 100644 --- a/Dockerfile_armhf +++ b/Dockerfile_armhf @@ -29,7 +29,7 @@ EXPOSE 443 ENV S6_LOGGING 0 ENV S6_KEEP_ENV 1 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 -ENV FTL_CMD debug +ENV FTL_CMD no-daemon ENV VERSION v4.1.1 ENV ARCH armhf diff --git a/test/conftest.py b/test/conftest.py index 881454b..43117d4 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -8,7 +8,7 @@ check_output = testinfra.get_backend( def DockerGeneric(request, args, image, cmd, entrypoint=''): assert 'docker' in check_output('id'), "Are you in the docker group?" if 'pihole' in image: - args += " --dns 127.0.0.1 --dns 1.1.1.1 -v /dev/null:/etc/pihole/adlists.default -e PYTEST=1" + args += " --dns 127.0.0.1 --dns 1.1.1.1 -v /dev/null:/etc/pihole/adlists.default -e PYTEST=1 --cap-add=NET_ADMIN" docker_run = "docker run -d -t {args} {entry} {image} {cmd}".format(args=args, entry=entrypoint, image=image, cmd=cmd) print docker_run docker_id = check_output(docker_run)