Merge pull request #22 from craig-willis/v0.2-fixes

Bug fixes found in v0.2
whole-tale · Jun 8, 2018 · 8761589 · 8761589
2 parents 495e436 + 90cddab
commit 8761589
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/scripts/start-worker.sh b/scripts/start-worker.sh
@@ -4,8 +4,9 @@ domain=$1
 role=$2
 registry_user=$3
 registry_pass=$4
+version=$5
 
-image=wholetale/gwvolman:stable
+image=wholetale/gwvolman:${version}
 
 sudo umount /usr/local/lib > /dev/null 2>&1 || true
 docker stop celery_worker >/dev/null 2>&1

diff --git a/stack.tf b/stack.tf
@@ -14,6 +14,7 @@ data "template_file" "stack" {
     domain = "${var.domain}"
     subdomain = "${var.subdomain}"
     mtu = "${var.docker_mtu}"
+    version = "${var.version}"
     godaddy_api_key = "${var.godaddy_api_key}"
     godaddy_api_secret = "${var.godaddy_api_secret}"
   }
@@ -107,7 +108,7 @@ resource "null_resource" "deploy_stack" {
   provisioner "remote-exec" {
     inline = [
       "chmod +x /home/core/wholetale/start-worker.sh",
-      "/home/core/wholetale/start-worker.sh ${var.subdomain}.${var.domain} manager ${var.registry_user} ${var.registry_pass}"
+      "/home/core/wholetale/start-worker.sh ${var.subdomain}.${var.domain} manager ${var.registry_user} ${var.registry_pass} ${var.version}"
     ]
   }
 }
@@ -136,7 +137,7 @@ resource "null_resource" "start_worker" {
   provisioner "remote-exec" {
     inline = [
       "chmod +x /home/core/wholetale/start-worker.sh",
-      "/home/core/wholetale/start-worker.sh ${var.subdomain}.${var.domain} celery ${var.registry_user} ${var.registry_pass}"
+      "/home/core/wholetale/start-worker.sh ${var.subdomain}.${var.domain} celery ${var.registry_user} ${var.registry_pass} ${var.version}"
     ]
   }
 }
diff --git a/stacks/core/swarm-compose.tpl b/stacks/core/swarm-compose.tpl
@@ -82,11 +82,14 @@ services:
         constraints:
           - node.labels.mongo.replica == 3
   girder:
-    image: wholetale/girder:latest
+    image: wholetale/girder:${version}
     networks:
       - celery
       - traefik-net
       - mongo
+    volumes:
+      - "/mnt/homes:/tmp/wt-home-dirs"
+      - "/mnt/homes:/tmp/wt-tale-dirs"
     deploy:
       replicas: 1
       labels:
@@ -109,7 +112,7 @@ services:
         - "traefik.enable=false"
 
   dashboard:
-    image: wholetale/dashboard:stable
+    image: wholetale/dashboard:${version}
     networks:
       - traefik-net
     environment:

diff --git a/variables.tf b/variables.tf
@@ -101,3 +101,8 @@ variable "godaddy_api_secret" {
    default = ""
    description = "API secret for GoDaddy DNS"
 }
+
+variable "version" {
+   default = "latest"
+   description = "Docker component versions"
+}