Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Galaxy extras tweaks... #136

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[WIP] Galaxy extras tweaks... #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b02aa7
Galaxy extras tweaks...
jmchilton Jan 15, 2016
732133c
Rev ansible galaxy extras again.
jmchilton Jan 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions galaxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,6 @@ PG_DATA_DIR_HOST=/export/postgresql/9.3/main/ \
# We need to set $HOME for some Tool Shed tools (e.g Perl libs with $HOME/.cpan)
HOME=$GALAXY_HOME

# prefetch Python wheels
RUN ./scripts/common_startup.sh && \
# Install all required Node dependencies. This is required to get proxy support to work for Interactive Environments
cd $GALAXY_ROOT/lib/galaxy/web/proxy/js && npm install

# Container Style
ADD GalaxyDocker.png $GALAXY_CONFIG_DIR/web/welcome_image.png
ADD welcome.html $GALAXY_CONFIG_DIR/web/welcome.html
Expand Down
2 changes: 1 addition & 1 deletion galaxy/roles/galaxyprojectdotorg.galaxyextras
Open in desktop
Submodule galaxyprojectdotorg.galaxyextras updated 4 files
+7 −4 defaults/main.yml
+5 −0 tasks/ie_proxy.yml
+30 −14 tasks/supervisor.yml
+1 −1 templates/supervisor.conf.j2