Adding no-daemon opt back in which works with correct capabilities (NET_ADMIN)
Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
parent
2336174036
commit
a5211510db
|
@ -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 }}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue