From a51e67a92a14e28cd78d42adac3836861e725a84 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Sun, 26 Apr 2020 00:28:48 -0400
Subject: [PATCH] MISTBORN_TAG

---
 base.yml             | 10 +++++-----
 scripts/env/setup.sh | 12 ++++++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/base.yml b/base.yml
index cfb3f2b..9adc997 100644
--- a/base.yml
+++ b/base.yml
@@ -7,7 +7,7 @@ volumes:
 
 services:
   django:
-    image: cyber5k/mistborn:latest 
+    image: cyber5k/mistborn:{MISTBORN_TAG}
     container_name: mistborn_production_django
     depends_on:
       - postgres
@@ -60,7 +60,7 @@ services:
     restart: unless-stopped
 
   celeryworker:
-    image: cyber5k/mistborn:latest 
+    image: cyber5k/mistborn:{MISTBORN_TAG}
     container_name: mistborn_production_celeryworker
     volumes:
       - /home/mistborn/.ssh:/ssh
@@ -83,7 +83,7 @@ services:
     restart: unless-stopped
   
   celeryworker-low-priority:
-    image: cyber5k/mistborn:latest 
+    image: cyber5k/mistborn:{MISTBORN_TAG}
     container_name: mistborn_production_celeryworker_low_priority
     volumes:
       - /home/mistborn/.ssh:/ssh
@@ -106,7 +106,7 @@ services:
     restart: unless-stopped
 
   celerybeat:
-    image: cyber5k/mistborn:latest 
+    image: cyber5k/mistborn:{MISTBORN_TAG}
     container_name: mistborn_production_celerybeat
     env_file:
       - ./.envs/.production/.django
@@ -116,7 +116,7 @@ services:
     
 
   flower:
-    image: cyber5k/mistborn:latest 
+    image: cyber5k/mistborn:{MISTBORN_TAG}
     container_name: mistborn_production_flower
     env_file:
       - ./.envs/.production/.django
diff --git a/scripts/env/setup.sh b/scripts/env/setup.sh
index a0a53eb..6b03c5a 100755
--- a/scripts/env/setup.sh
+++ b/scripts/env/setup.sh
@@ -4,10 +4,18 @@ VAR_FILE=/opt/mistborn/.env
 
 source /opt/mistborn/scripts/subinstallers/platform.sh
 
-export MISTBORN_DNS_BIND_IP="0.0.0.0"
+MISTBORN_DNS_BIND_IP="0.0.0.0"
 if [ "$DISTRO" == "ubuntu" ] && [ "$VERSION_ID" == "20.04" ]; then
-    export MISTBORN_DNS_BIND_IP="10.2.3.1"
+    MISTBORN_DNS_BIND_IP="10.2.3.1"
 fi
 
 echo "MISTBORN_DNS_BIND_IP=${MISTBORN_DNS_BIND_IP}" | sudo tee ${VAR_FILE}
 sudo chown mistborn:mistborn ${VAR_FILE}
+
+GIT_BRANCH=$(git -C /opt/mistborn symbolic-ref --short HEAD || echo "master")
+MISTBORN_TAG="latest"
+if [ "$GIT_BRANCH" != "master" ]; then
+    MISTBORN_TAG="test"
+fi
+
+echo "MISTBORN_TAG=$MISTBORN_TAG" | sudo tee -a ${VAR_FILE}