Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2026-04-21 01:10:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

make sure that setup_FTL_ProcessDNSSettings is the last thing called, else user set environment variables will be overridden when it sources setupVars.conf

Browse Source 
Some additional tweaks
This commit is contained in:
Adam Warner
2022-07-19 18:22:49 +01:00
parent 970c45c950
commit e75e3800a2
5 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/Dockerfile
View File

@@ -13,14 +13,14 @@ RUN apt-get update && \
RUN curl -L https://github.com/docker/compose/releases/download/1.25.5/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose && \
chmod +x /usr/local/bin/docker-compose
COPY ./Dockerfile.sh /usr/local/bin/
COPY ./cmd.sh /usr/local/bin/
COPY Pipfile* /root/
WORKDIR /root
RUN pipenv install --system \
&& sed -i 's|/bin/sh|/bin/bash|g' /usr/local/lib/python3.8/site-packages/testinfra/backend/docker.py
RUN echo "set -ex && Dockerfile.sh && \$@" > /usr/local/bin/entrypoint.sh
RUN echo "set -ex && cmd.sh && \$@" > /usr/local/bin/entrypoint.sh
RUN chmod +x /usr/local/bin/entrypoint.sh
ENTRYPOINT entrypoint.sh
CMD Dockerfile.sh
CMD cmd.sh