From 92d91f2c76bfd3aa4a23e681eac5327675dc1d84 Mon Sep 17 00:00:00 2001 From: diginc Date: Sat, 5 Nov 2016 12:39:20 -0500 Subject: [PATCH] Update pathing in dockerfile --- test/centos.Dockerfile | 7 ++++--- test/debian.Dockerfile | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/test/centos.Dockerfile b/test/centos.Dockerfile index 9af7eb4d..08ec9bae 100644 --- a/test/centos.Dockerfile +++ b/test/centos.Dockerfile @@ -5,10 +5,11 @@ ENV SCRIPTDIR /opt/pihole RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole ADD . $GITDIR -RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/ +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/* - -#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \ diff --git a/test/debian.Dockerfile b/test/debian.Dockerfile index b80d6155..d82a58fe 100644 --- a/test/debian.Dockerfile +++ b/test/debian.Dockerfile @@ -5,11 +5,12 @@ ENV SCRIPTDIR /opt/pihole RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole ADD . $GITDIR -RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/ +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/* - -#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \