docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
Adam Hill 2019-01-01 14:46:34 -06:00
parent 2336174036
commit a5211510db
No known key found for this signature in database
GPG Key ID: 2193804FCA429855
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.template
View File

@ -29,7 +29,7 @@ EXPOSE 443
ENV S6_LOGGING 0 ENV S6_LOGGING 0
ENV S6_KEEP_ENV 1 ENV S6_KEEP_ENV 1
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
ENV FTL_CMD debug ENV FTL_CMD no-daemon
ENV VERSION {{ pihole.version }} ENV VERSION {{ pihole.version }}
ENV ARCH {{ pihole.arch }} ENV ARCH {{ pihole.arch }}

2
Dockerfile_aarch64
View File

@ -29,7 +29,7 @@ EXPOSE 443
ENV S6_LOGGING 0 ENV S6_LOGGING 0
ENV S6_KEEP_ENV 1 ENV S6_KEEP_ENV 1
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
ENV FTL_CMD debug ENV FTL_CMD no-daemon
ENV VERSION v4.1.1 ENV VERSION v4.1.1
ENV ARCH aarch64 ENV ARCH aarch64

2
Dockerfile_amd64
View File

@ -29,7 +29,7 @@ EXPOSE 443
ENV S6_LOGGING 0 ENV S6_LOGGING 0
ENV S6_KEEP_ENV 1 ENV S6_KEEP_ENV 1
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
ENV FTL_CMD debug ENV FTL_CMD no-daemon
ENV VERSION v4.1.1 ENV VERSION v4.1.1
ENV ARCH amd64 ENV ARCH amd64

2
Dockerfile_armel
View File

@ -29,7 +29,7 @@ EXPOSE 443
ENV S6_LOGGING 0 ENV S6_LOGGING 0
ENV S6_KEEP_ENV 1 ENV S6_KEEP_ENV 1
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
ENV FTL_CMD debug ENV FTL_CMD no-daemon
ENV VERSION v4.1.1 ENV VERSION v4.1.1
ENV ARCH armel ENV ARCH armel

2
Dockerfile_armhf
View File

@ -29,7 +29,7 @@ EXPOSE 443
ENV S6_LOGGING 0 ENV S6_LOGGING 0
ENV S6_KEEP_ENV 1 ENV S6_KEEP_ENV 1
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
ENV FTL_CMD debug ENV FTL_CMD no-daemon
ENV VERSION v4.1.1 ENV VERSION v4.1.1
ENV ARCH armhf ENV ARCH armhf

2
test/conftest.py
View File

@ -8,7 +8,7 @@ check_output = testinfra.get_backend(
def DockerGeneric(request, args, image, cmd, entrypoint=''): def DockerGeneric(request, args, image, cmd, entrypoint=''):
assert 'docker' in check_output('id'), "Are you in the docker group?" assert 'docker' in check_output('id'), "Are you in the docker group?"
if 'pihole' in image: 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) docker_run = "docker run -d -t {args} {entry} {image} {cmd}".format(args=args, entry=entrypoint, image=image, cmd=cmd)
print docker_run print docker_run
docker_id = check_output(docker_run) docker_id = check_output(docker_run)