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

Merge pull request #380 from pi-hole/dev 

Disable debug logging & docker logging stdout of pihole-FTL
This commit is contained in:
Adam Hill 2019-01-02 23:29:04 -06:00 committed by GitHub
parent 26e1c82fd0 a5211510db
commit aac258ad1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 15 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_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 }}

6
Dockerfile_aarch64
View File

@ -29,13 +29,13 @@ 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
ENV VERSION v4.1.1
ENV ARCH aarch64
ENV PATH /opt/pihole:${PATH}
LABEL image="pihole/pihole:v4.1_aarch64"
LABEL image="pihole/pihole:v4.1.1_aarch64"
LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"

2
Dockerfile_amd64
View File

@ -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

6
Dockerfile_armel
View File

@ -29,13 +29,13 @@ 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
ENV VERSION v4.1.1
ENV ARCH armel
ENV PATH /opt/pihole:${PATH}
LABEL image="pihole/pihole:v4.1_armel"
LABEL image="pihole/pihole:v4.1.1_armel"
LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"

6
Dockerfile_armhf
View File

@ -29,13 +29,13 @@ 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
ENV VERSION v4.1.1
ENV ARCH armhf
ENV PATH /opt/pihole:${PATH}
LABEL image="pihole/pihole:v4.1_armhf"
LABEL image="pihole/pihole:v4.1.1_armhf"
LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"

2
deploy_docker.sh
View File

@ -70,7 +70,7 @@ $dry tox
images=()
for tag in ${!arch_map[@]}; do
# Verison specific tags for ongoing history
$dry docker tag $localimg:v4.1_$tag $remoteimg:${version}_${tag}
$dry docker tag $localimg:v4.1.1_$tag $remoteimg:${version}_${tag}
$dry docker push pihole/pihole:${version}_${tag}
images+=(pihole/pihole:${version}_${tag})
done

4
s6/debian-root/etc/services.d/pihole-FTL/run
View File

@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bash
s6-echo "Starting pihole-FTL ($FTL_CMD)"
s6-setuidgid root pihole-FTL $FTL_CMD
# /var/log/pihole*.log has this data - this duplicates it in docker logs unless you send to dev null
s6-setuidgid root pihole-FTL $FTL_CMD >/dev/null 2>&1

2
test/conftest.py
View File

@ -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)