From c31da7718b1c0164169d0ed2d68b3954903610e7 Mon Sep 17 00:00:00 2001
From: Arthur Le Bars <arthur.le-bars@sb-roscoff.fr>
Date: Mon, 22 Mar 2021 12:02:29 +0100
Subject: [PATCH] new gspecies docker compose template
---
templates/gspecies_compose_template.yml.j2 | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/templates/gspecies_compose_template.yml.j2 b/templates/gspecies_compose_template.yml.j2
index d6ca429..d2199c3 100644
--- a/templates/gspecies_compose_template.yml.j2
+++ b/templates/gspecies_compose_template.yml.j2
@@ -16,8 +16,7 @@ services:
# Download page
- "traefik.http.routers.{{ genus_species }}-nginx.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/download`))"
# - "traefik.http.routers.{{ genus_species }}-nginx.tls=true"
-# - "traefik.http.routers.{{ genus_species }}-nginx.entryPoints=webs"
- - "traefik.http.routers.{{ genus_species }}-nginx.entryPoints=web" # lg
+ - "traefik.http.routers.{{ genus_species }}-nginx.entryPoints={{ entrypoint }}" # lg
# - "traefik.http.routers.{{ genus_species }}-nginx.middlewares=sp-auth,sp-app-trailslash,sp-prefix"
- "traefik.http.routers.{{ genus_species }}-nginx.middlewares=sp-app-trailslash,sp-prefix" # lg
- "traefik.http.services.{{ genus_species }}-nginx.loadbalancer.server.port=80"
@@ -70,8 +69,7 @@ services:
labels:
- "traefik.http.routers.{{ genus_species }}-tripal.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}`))"
# - "traefik.http.routers.{{ genus_species }}-tripal.tls=true"
-# - "traefik.http.routers.{{ genus_species }}-tripal.entryPoints=webs"
- - "traefik.http.routers.{{ genus_species }}-tripal.entryPoints=web" # lg
+ - "traefik.http.routers.{{ genus_species }}-tripal.entryPoints={{ entrypoint }}" # lg
# - "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-auth,sp-trailslash,sp-prefix,tripal-addprefix"
- "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-trailslash,sp-prefix,tripal-addprefix" # lg
- "traefik.http.services.{{ genus_species }}-tripal.loadbalancer.server.port=80"
@@ -138,7 +136,7 @@ services:
GALAXY_CONFIG_MASTER_API_KEY: "{{ galaxy_config_master_api_key }}"
ENABLE_FIX_PERMS: 0
PROXY_PREFIX: /sp/{{ genus_species }}/galaxy
- GALAXY_TRIPAL_URL: http://tripal. {{ genus_species }}/tripal/
+ GALAXY_TRIPAL_URL: http://tripal.{{ genus_species }}/tripal/
GALAXY_TRIPAL_PASSWORD: {{ tripal_password }} # See tripal config above
GALAXY_WEBAPOLLO_URL: http://one-of-the-swarm-node:8888/apollo/
GALAXY_WEBAPOLLO_USER: "{{ webapollo_user }}"
@@ -158,8 +156,7 @@ services:
labels:
- "traefik.http.routers.{{ genus_species }}-galaxy.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/galaxy`))"
# - "traefik.http.routers.{{ genus_species }}-galaxy.tls=true"
-# - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=webs"
- - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=web" #lg
+ - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints={{ entrypoint }}"
# - "traefik.http.routers.{{ genus_species }}-galaxy.middlewares=sp-auth,sp-app-trailslash,sp-app-prefix"
- "traefik.http.routers.{{ genus_species }}-galaxy.middlewares=sp-app-trailslash,sp-app-prefix" #lg
- "traefik.http.services.{{ genus_species }}-galaxy.loadbalancer.server.port=80"
@@ -186,8 +183,7 @@ services:
labels:
- "traefik.http.routers.{{ genus_species }}-jbrowse.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/jbrowse`))"
# - "traefik.http.routers.{{ genus_species }}-jbrowse.tls=true"
-# - "traefik.http.routers.{{ genus_species }}-jbrowse.entryPoints=webs"
- - "traefik.http.routers.{{ genus_species }}-jbrowse.entryPoints=web" # lg
+ - "traefik.http.routers.{{ genus_species }}-jbrowse.entryPoints={{ entrypoint }}" # lg
# - "traefik.http.routers.{{ genus_species }}-jbrowse.middlewares=sp-auth,sp-app-trailslash,sp-app-prefix"
- "traefik.http.routers.{{ genus_species }}-jbrowse.middlewares=sp-app-trailslash,sp-app-prefix" #lg
- "traefik.http.services.{{ genus_species }}-jbrowse.loadbalancer.server.port=80"
@@ -242,8 +238,7 @@ services:
labels:
- "traefik.http.routers.{{ genus_species }}-blast.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/blast`))"
# - "traefik.http.routers.{{ genus_species }}-blast.tls=true"
-# - "traefik.http.routers.{{ genus_species }}-blast.entryPoints=webs"
- - "traefik.http.routers.{{ genus_species }}-blast.entryPoints=web" # lg
+ - "traefik.http.routers.{{ genus_species }}-blast.entryPoints={{ entrypoint }}" # lg
# - "traefik.http.routers.{{ genus_species }}-blast.middlewares=sp-big-req,sp-auth,sp-app-trailslash,sp-app-prefix"
- "traefik.http.routers.{{ genus_species }}-blast.middlewares=sp-big-req,sp-app-trailslash,sp-app-prefix" # lg
- "traefik.http.services.{{ genus_species }}-blast.loadbalancer.server.port=80"
@@ -286,7 +281,7 @@ services:
# labels:
# - "traefik.http.routers.{{ genus_species }}-blast.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/blast`))"
# - "traefik.http.routers.{{ genus_species }}-blast.tls=true"
-# - "traefik.http.routers.{{ genus_species }}-blast.entryPoints=webs"
+# - "traefik.http.routers.{{ genus_species }}-blast.entryPoints={{ entrypoint }}"
# - "traefik.http.routers.{{ genus_species }}-blast.middlewares=sp-big-req,sp-auth,sp-app-trailslash,sp-app-prefix"
# - "traefik.http.services.{{ genus_species }}-blast.loadbalancer.server.port=80"
# restart_policy:
--
GitLab