1
0
Fork 0

Merge branch 'master' of p281392/molgenis-ops-rancher into master

This commit is contained in:
Sido Haakma 2018-03-11 23:04:50 +01:00 committed by Gogs
commit d8a1233fd3
6 changed files with 8 additions and 8 deletions

View File

@ -1,5 +1,5 @@
app: app:
image: sidohaakma/molgenis-docker:2.0.0 image: registry.webhosting.rug.nl/molgenis:2.0.1
ports: ports:
- 8081:8080 - 8081:8080
links: links:
@ -14,7 +14,7 @@ app:
traefik.enable: true traefik.enable: true
traefik.port: 8080 traefik.port: 8080
db: db:
build: ./db image: registry.webhosting.rug.nl/molgenis-postgres:2.0.1
expose: expose:
- 5432 - 5432
volumes: volumes:

View File

@ -1,5 +1,5 @@
app: app:
image: sidohaakma/molgenis-docker:4.1.0 image: registry.webhosting.rug.nl/molgenis/molgenis:4.1.0
ports: ports:
- 8081:8080 - 8081:8080
links: links:

View File

@ -51,7 +51,7 @@
#io.rancher.sidekicks: elasticsearch-data #io.rancher.sidekicks: elasticsearch-data
opencpu: opencpu:
image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:5.2.0
ports: ports:
- 8004:8004 - 8004:8004

View File

@ -52,7 +52,7 @@
io.rancher.scheduler.global: true io.rancher.scheduler.global: true
opencpu: opencpu:
image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:6.0.0
ports: ports:
- 8004:8004 - 8004:8004

View File

@ -1,5 +1,5 @@
molgenis: molgenis:
image: registry.webhosting.rug.nl/molgenis/molgenis:7.0.0 image: registry.webhosting.rug.nl/molgenis/molgenis:7.0.0-SNAPSHOT
ports: ports:
- 8080 - 8080
links: links:
@ -32,7 +32,7 @@
io.rancher.scheduler.global: true io.rancher.scheduler.global: true
opencpu: opencpu:
image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:7.0.0-SNAPSHOT
ports: ports:
- 8004:8004 - 8004:8004

View File

@ -1,6 +1,6 @@
.catalog: .catalog:
name: molgenis name: molgenis
version: v6.0.0 version: v7.0.0
description: Molgenis description: Molgenis
minimum_rancher_version: v1.6.3 minimum_rancher_version: v1.6.3
questions: questions: