From c3a4827c837798fe62973a5675855364a0ee1e2d Mon Sep 17 00:00:00 2001 From: sido Date: Thu, 8 Mar 2018 17:21:41 +0100 Subject: [PATCH] refactor(readme and compose): updated readmes and compose files --- README.md | 12 ++++++++++++ templates/molgenis/1/README.md | 7 +++---- templates/molgenis/1/docker-compose.yml | 9 +-------- templates/molgenis/2/README.md | 8 +++----- templates/molgenis/2/docker-compose.yml | 15 +++++---------- templates/molgenis/2/rancher-compose.yml | 2 +- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index e69de29..6b58d74 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,12 @@ +# Rancher +We use docker-compose.yml files to specify a version-range to deploy a MOLGENIS-stack + +## Configuration + +Exmaple + +```bash +molgenis: + image: registry.webhosting.rug.nl/molgenis-docker:5.2.0 +``` + diff --git a/templates/molgenis/1/README.md b/templates/molgenis/1/README.md index 907b6c8..36bc32f 100644 --- a/templates/molgenis/1/README.md +++ b/templates/molgenis/1/README.md @@ -1,16 +1,15 @@ # MOLGENIS -**Flexible software for scientific data** +Flexible software for scientific data +## Rancher configuration This template creates a MOLGENIS stack on top of Rancher. It creates 3 docker services: - MOLGENIS - Elasticsearch is packaged with MOLGENIS - Postgress -**Usage:** - - +## Usage - Select MOLGENIS from catalog - The stack-name must not be altered (this is hardcoded in de docker-compose file) - Click *Launch* diff --git a/templates/molgenis/1/docker-compose.yml b/templates/molgenis/1/docker-compose.yml index aa5bb23..6bec5de 100644 --- a/templates/molgenis/1/docker-compose.yml +++ b/templates/molgenis/1/docker-compose.yml @@ -9,8 +9,7 @@ app: labels: io.rancher.sidekicks: molgenis-data io.rancher.scheduler.global: true - io.rancher.scheduler.affinity:host_label: type=molgenis - io.rancher.scheduler.affinity:container_label: io.rancher.stack.name=molgenis + db: image: postgres:9.6-alpine environment: @@ -24,22 +23,16 @@ app: labels: io.rancher.sidekicks: postgres-data io.rancher.scheduler.global: true - io.rancher.scheduler.affinity:host_label: type=molgenis - io.rancher.scheduler.affinity:container_label: io.rancher.stack.name=molgenis postgres-data: image: busybox labels: io.rancher.container.start_once: true - io.rancher.scheduler.affinity:host_label: type=molgenis - io.rancher.scheduler.affinity:container_label: io.rancher.stack.name=molgenis volumes: - /var/lib/postgresql/data/pgdata molgenis-data: image: busybox labels: io.rancher.container.start_once: true - io.rancher.scheduler.affinity:host_label: type=molgenis - io.rancher.scheduler.affinity:container_label: io.rancher.stack.name=molgenis volumes: - /opt/molgenis \ No newline at end of file diff --git a/templates/molgenis/2/README.md b/templates/molgenis/2/README.md index a310f32..b65dd55 100644 --- a/templates/molgenis/2/README.md +++ b/templates/molgenis/2/README.md @@ -1,16 +1,14 @@ # MOLGENIS -**Flexible software for scientific data** - +Flexible software for scientific data +## Rancher configuration This template creates a MOLGENIS stack on top of Rancher. It creates 3 docker services: - MOLGENIS - Postgress - ElasticSearch -**Usage:** - - +## Usage - Select MOLGENIS from catalog - The stack-name must not be altered (this is hardcoded in de docker-compose file) - Click *Launch* diff --git a/templates/molgenis/2/docker-compose.yml b/templates/molgenis/2/docker-compose.yml index ce04dec..bcae0c0 100644 --- a/templates/molgenis/2/docker-compose.yml +++ b/templates/molgenis/2/docker-compose.yml @@ -11,8 +11,7 @@ io.rancher.sidekicks: molgenis-data io.rancher.scheduler.global: true io.rancher.container.pull_image: always - io.rancher.scheduler.affinity:host_label: type=molgenis - io.rancher.scheduler.affinity:container_label: io.rancher.stack.name=molgenis + postgres: image: postgres:9.6-alpine environment: @@ -27,8 +26,7 @@ labels: io.rancher.sidekicks: postgres-data io.rancher.scheduler.global: true - io.rancher.scheduler.affinity:host_label: type=molgenis - io.rancher.scheduler.affinity:container_label: io.rancher.stack.name=molgenis + elasticsearch: image: docker.elastic.co/elasticsearch/elasticsearch:5.5.1 environment: @@ -48,8 +46,7 @@ labels: #io.rancher.sidekicks: elasticsearch-data io.rancher.scheduler.global: true - io.rancher.scheduler.affinity:host_label: type=molgenis - io.rancher.scheduler.affinity:container_label: io.rancher.stack.name=molgenis + # loadbalancer: # image: rancher/lb-service-haproxy:v0.7.5 # ports: @@ -63,18 +60,16 @@ image: busybox labels: io.rancher.container.start_once: true - io.rancher.scheduler.affinity:host_label: type=molgenis - io.rancher.scheduler.affinity:container_label: io.rancher.stack.name=molgenis volumes: - /var/lib/postgresql/data/pgdata + molgenis-data: image: busybox labels: io.rancher.container.start_once: true - io.rancher.scheduler.affinity:host_label: type=molgenis - io.rancher.scheduler.affinity:container_label: io.rancher.stack.name=molgenis volumes: - /opt/molgenis + # elasticsearch-data: # image: busybox # labels: diff --git a/templates/molgenis/2/rancher-compose.yml b/templates/molgenis/2/rancher-compose.yml index 1b08e52..7b53ec2 100644 --- a/templates/molgenis/2/rancher-compose.yml +++ b/templates/molgenis/2/rancher-compose.yml @@ -1,6 +1,6 @@ .catalog: name: molgenis - version: v5.0.0 + version: v5.2.0 description: Molgenis minimum_rancher_version: v1.6.3 #loadbalancer: