arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity

move PH_TRUE to Dockerfiles to DRY

Browse Source
This commit is contained in:
diginc 2016-11-03 22:34:04 -05:00
parent c2930b0ca5
commit b9f3493dbc
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
automated install/basic-install.sh
View File

@ -1149,6 +1149,6 @@ main() {
echo "::: The install log is located at: /etc/pihole/install.log"
}
if [[ "${PHTEST}" != "TRUE" ]] ; then
if [[ "${PH_TEST}" != true ]] ; then
main "$@"
fi

2
test/centos.Dockerfile
View File

@ -11,4 +11,6 @@ ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
RUN true && \
chmod +x $SCRIPTDIR/*
ENV PH_TEST true
#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \

3
test/debian.Dockerfile
View File

@ -8,8 +8,9 @@ ADD . $GITDIR
RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
RUN true && \
chmod +x $SCRIPTDIR/*
ENV PH_TEST true
#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \

2
test/test_automated_install.py
View File

@ -53,7 +53,6 @@ def test_setupVars_saved_to_file(Pihole):
set -e
echo start
TERM=xterm
PHTEST=TRUE
source /opt/pihole/basic-install.sh
{}
finalExports
@ -69,7 +68,6 @@ def test_configureFirewall_firewalld_no_errors(Pihole):
''' confirms firewalld rules are applied when appopriate '''
mock_command('firewall-cmd', '0', Pihole)
configureFirewall = Pihole.run('''
PHTEST=TRUE
source /opt/pihole/basic-install.sh
configureFirewall
''')