Skip to content

Commit

Permalink
path-based ITs are not working oob
Browse files Browse the repository at this point in the history 
ping @sveinugu
  • Loading branch information
@bgruening
bgruening authored Jul 10, 2024
1 parent 162ee05 commit e216b45
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tools/interactive/interactivetool_jupyter_notebook_1.0.0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<container type="docker">quay.io/bgruening/docker-jupyter-notebook:2021-03-05</container>
</requirements>
<entry_points>
<entry_point name="JupyTool interactive tool" label="jupytool" requires_domain="False" requires_path_in_url="True">
<entry_point name="JupyTool interactive tool" label="jupytool" requires_domain="True">
<port>8888</port>
<url>ipython/lab</url>
</entry_point>
Expand All @@ -14,7 +14,7 @@
<environment_variable name="GALAXY_WEB_PORT">8080</environment_variable>
<environment_variable name="GALAXY_URL">$__galaxy_url__</environment_variable>
<environment_variable name="API_KEY" inject="api_key"/>
<environment_variable name="EP_PATH" inject="entry_point_path_for_label">jupytool</environment_variable>
<!--environment_variable name="EP_PATH" inject="entry_point_path_for_label">jupytool</environment_variable-->
</environment_variables>
<configfiles>
<inputs name="inputs" filename="galaxy_inputs.json" data_style="staging_path_and_source_path"/>
Expand Down Expand Up @@ -81,7 +81,7 @@ except FileNotFoundError:
export GALAXY_WORKING_DIR=`pwd` &&
mkdir -p ./jupyter/outputs/collection &&
mkdir -p ./jupyter/galaxy_inputs &&
export PROXY_PREFIX=\${EP_PATH%/ipython*} &&
##export PROXY_PREFIX=\${EP_PATH%/ipython*} &&
## change into the directory where the notebooks are located
cd ./jupyter/ &&
Expand Down

4 comments on commit e216b45

@sveinugu
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is hardly the fix...

As mentioned in galaxyproject#18481 (comment), usegalaxy.eu needs to be configured for path-based tools, which includes at least:

I don't think any changes to galaxy.yml is required (it's been a while). @kysrpex should have the overview of this now.

@kysrpex
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is right @bgruening, no changes to this file are needed. Please revert revert this commit. I'm opening a PR in usegalaxy-eu/infrastructure-playbook with the needed changes and pinging both of you.

@sanjaysrikakulam
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We debugged it late last night after the 24.1 upgrade. We wanted to get things back online, and I only identified the things that would require for the path-based ITs to work on EU in the morning (the ones you mentioned). Thanks, @kysrpex; PR addressing this would be great, and we can revert this.

@kysrpex
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR is ready usegalaxy-eu/infrastructure-playbook#1256

Please sign in to comment.