diff --git a/run_workflow_phaeoexplorer.py b/run_workflow_phaeoexplorer.py index 4e9a35fd33611537a3f4f260632d81f4390d02f5..90ab7fe5a1d3c1c1bbd79e07ba626cc9e904cbb9 100644 --- a/run_workflow_phaeoexplorer.py +++ b/run_workflow_phaeoexplorer.py @@ -483,7 +483,7 @@ class RunWorkflow(speciesData.SpeciesData): # In case of the Jbrowse workflow, we unfortunately have to manually edit the parameters instead of setting them # as runtime values, using runtime parameters makes the tool throw an internal critical error ("replace not found" error) if workflow_name == "Jbrowse": - workflow_dict["steps"]["2"]["tool_state"] = workflow_dict["steps"]["2"]["tool_state"].replace("__MENU_URL__", "http://localhost:{port}/sp/{genus_sp}/feature/{Genus}/{species}/{id}".format(port=self.config["http_port"], genus_sp=self.genus_species, Genus=self.genus_uppercase, species=self.species, id="{id}")) + workflow_dict["steps"]["2"]["tool_state"] = workflow_dict["steps"]["2"]["tool_state"].replace("__MENU_URL__", "https://{host}:{port}/sp/{genus_sp}/feature/{Genus}/{species}/{id}".format(host=self.config["host"], port=self.config["https_port"], genus_sp=self.genus_species, Genus=self.genus_uppercase, species=self.species, id="{id}")) workflow_dict["steps"]["3"]["tool_state"] = workflow_dict["steps"]["3"]["tool_state"].replace("__FULL_NAME__", self.full_name).replace("__UNIQUE_ID__", self.abbreviation) # Import the workflow in galaxy as a dict @@ -850,16 +850,12 @@ if __name__ == "__main__": # Parse the config yaml file run_workflow_for_current_organism.config = utilities.parse_config(args.config) - # Set the instance url attribute - for env_variable, value in run_workflow_for_current_organism.config.items(): - if env_variable == "hostname": - run_workflow_for_current_organism.instance_url = "http://{0}:8888/sp/{1}/galaxy/".format( - value, run_workflow_for_current_organism.genus_species) - break - else: - run_workflow_for_current_organism.instance_url = "http://localhost:8888/sp/{0}_{1}/galaxy/".format( - run_workflow_for_current_organism.genus_lowercase, - run_workflow_for_current_organism.species) + # Set the instance url attribute + run_workflow_for_current_organism.instance_url = "http://localhost:{0}/sp/{1}_{2}/galaxy/".format( + run_workflow_for_current_organism.config["http_port"] + run_workflow_for_current_organism.genus_lowercase, + run_workflow_for_current_organism.species) + # If input workflow is Chado_load_Tripal_synchronize.ga diff --git a/templates/gspecies_compose_template.yml.j2 b/templates/gspecies_compose_template.yml.j2 index fd32d56a30361c64bdf61521e87f417978d685f4..6bf0adcc41e19a1b29b5e1179f17ccfcae945e30 100644 --- a/templates/gspecies_compose_template.yml.j2 +++ b/templates/gspecies_compose_template.yml.j2 @@ -159,6 +159,8 @@ services: # - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=webs" - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=web" #lg # - "traefik.http.routers.{{ genus_species }}-galaxy.middlewares=sp-auth,sp-app-trailslash,sp-app-prefix" + - "traefik.http.routers.{{ genus_species }}-gga_load-galaxy.rule=(Host(`localhost`) && PathPrefix(`/sp/{{ genus_species }}/galaxy`))" + - "traefik.http.routers.{{ genus_species }}-gga_load-galaxy.entryPoints=web" - "traefik.http.routers.{{ genus_species }}-galaxy.middlewares=sp-app-trailslash,sp-app-prefix" #lg - "traefik.http.services.{{ genus_species }}-galaxy.loadbalancer.server.port=80" restart_policy: