From fb3777141b3f3949543fb315c15756ef960d0e84 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Mon, 9 Mar 2020 09:44:26 +0000
Subject: [PATCH] tanner, prepare merger w/ master

---
 docker/tanner/phpox/Dockerfile  | 4 ----
 docker/tanner/tanner/Dockerfile | 4 ++--
 update.sh                       | 2 +-
 version                         | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/docker/tanner/phpox/Dockerfile b/docker/tanner/phpox/Dockerfile
index 26221013..b5adfc91 100644
--- a/docker/tanner/phpox/Dockerfile
+++ b/docker/tanner/phpox/Dockerfile
@@ -1,8 +1,5 @@
 FROM alpine:3.10
 #
-# Include dist
-ADD dist/ /root/dist/
-#
 # Install packages
 RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
     apk -U --no-cache add \
@@ -32,7 +29,6 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
 # Install PHP Sandbox
     git clone --depth=1 https://github.com/mushorg/phpox /opt/phpox && \
     cd /opt/phpox && \
-#    cp /root/dist/sandbox.py . && \
     pip3 install -r requirements.txt && \
     make && \
 #
diff --git a/docker/tanner/tanner/Dockerfile b/docker/tanner/tanner/Dockerfile
index 2a23ec05..6512668c 100644
--- a/docker/tanner/tanner/Dockerfile
+++ b/docker/tanner/tanner/Dockerfile
@@ -19,8 +19,8 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
 # Setup Tanner
     git clone --depth=1 https://github.com/mushorg/tanner /opt/tanner && \
     cd /opt/tanner/ && \
-    git fetch origin pull/364/head:test && \	
-    git checkout test && \
+#    git fetch origin pull/364/head:test && \	
+#    git checkout test && \
     cp /root/dist/config.py /opt/tanner/tanner/ && \
     pip3 install --no-cache-dir setuptools && \
     pip3 install --no-cache-dir -r requirements.txt && \
diff --git a/update.sh b/update.sh
index 6941c429..ee18fad7 100755
--- a/update.sh
+++ b/update.sh
@@ -63,7 +63,7 @@ function fuSELFUPDATE () {
       echo "###### $myBLUE""No updates found in repository.""$myWHITE"
       return
   fi
-  myRESULT=$(git diff --name-only origin/dev | grep update.sh)
+  myRESULT=$(git diff --name-only origin/master | grep update.sh)
   if [ "$myRESULT" == "update.sh" ];
     then
       echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE"
diff --git a/version b/version
index 2b90a9b3..5298669f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-19.03.1
+19.03.2