From 5bc0fdef439dcdaf0e8189e3b918b8edcd29eadb Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Sun, 11 Mar 2018 22:58:14 +0100
Subject: [PATCH] fix(docker-compose.yml): updated registries for opencpu and
 postgres (2.0.1)

---
 templates/molgenis/0/docker-compose.yml | 4 ++--
 templates/molgenis/1/docker-compose.yml | 2 +-
 templates/molgenis/2/docker-compose.yml | 2 +-
 templates/molgenis/4/docker-compose.yml | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/molgenis/0/docker-compose.yml b/templates/molgenis/0/docker-compose.yml
index f27d861..a5e1808 100644
--- a/templates/molgenis/0/docker-compose.yml
+++ b/templates/molgenis/0/docker-compose.yml
@@ -1,5 +1,5 @@
 app:
-  image: sidohaakma/molgenis-docker:2.0.0
+  image: registry.webhosting.rug.nl/molgenis:2.0.1
   ports:
     - 8081:8080
   links:
@@ -14,7 +14,7 @@ app:
     traefik.enable: true
     traefik.port: 8080
 db:
-  build: ./db
+  image: registry.webhosting.rug.nl/molgenis-postgres:2.0.1
   expose:
     - 5432
   volumes:
diff --git a/templates/molgenis/1/docker-compose.yml b/templates/molgenis/1/docker-compose.yml
index 63a7310..181d839 100644
--- a/templates/molgenis/1/docker-compose.yml
+++ b/templates/molgenis/1/docker-compose.yml
@@ -1,5 +1,5 @@
 app:
-  image: sidohaakma/molgenis-docker:4.1.0
+  image: registry.webhosting.rug.nl/molgenis/molgenis:4.1.0
   ports:
     - 8081:8080
   links:
diff --git a/templates/molgenis/2/docker-compose.yml b/templates/molgenis/2/docker-compose.yml
index 6d15632..43309fa 100644
--- a/templates/molgenis/2/docker-compose.yml
+++ b/templates/molgenis/2/docker-compose.yml
@@ -51,7 +51,7 @@
       #io.rancher.sidekicks: elasticsearch-data
 
   opencpu:
-    image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu
+    image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:5.2.0
     ports:
       - 8004:8004
 
diff --git a/templates/molgenis/4/docker-compose.yml b/templates/molgenis/4/docker-compose.yml
index f7726a1..25e818b 100644
--- a/templates/molgenis/4/docker-compose.yml
+++ b/templates/molgenis/4/docker-compose.yml
@@ -1,5 +1,5 @@
   molgenis:
-    image: registry.webhosting.rug.nl/molgenis/molgenis:7.0.0
+    image: registry.webhosting.rug.nl/molgenis/molgenis:7.0.0-SNAPSHOT
     ports:
       - 8080
     links:
@@ -32,7 +32,7 @@
       io.rancher.scheduler.global: true
 
     opencpu:
-      image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:7.0.0
+      image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:7.0.0-SNAPSHOT
       ports:
         - 8004:8004