Skip to content

Commit 68c7a86

Browse files
committed
update Miniconda update
1 parent 12ddb1a commit 68c7a86

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

compose/galaxy-init/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ WORKDIR $GALAXY_ROOT
7777
#RUN export GALAXY=$GALAXY_ROOT && sh ./cron/updateucsc.sh.sample
7878

7979

80-
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda2-4.5.11-Linux-x86_64.sh -O ~/miniconda.sh && \
80+
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda2-4.5.12-Linux-x86_64.sh -O ~/miniconda.sh && \
8181
/bin/bash ~/miniconda.sh -b -p /tool_deps/_conda/ && \
8282
rm ~/miniconda.sh && \
8383
echo ". /tool_deps/_conda/etc/profile.d/conda.sh" >> ~/.bashrc && \
@@ -96,7 +96,7 @@ RUN export PATH=/tool_deps/_conda/bin/:$PATH && \
9696
cd $GALAXY_ROOT/client && yarn install --network-timeout 120000 --check-files && yarn run build-production-maps && \
9797
rm -rf /home/galaxy/.cache/ && \
9898
# change the default location of shed_tools to be ../shed_tools
99-
sed -i 's|database|..|' $GALAXY_CONFIG_DIR/shed_tool_conf.xml
99+
sed -i 's|database|..|' $GALAXY_ROOT/config/shed_tool_conf.xml
100100

101101
# Switch back to User root
102102
USER root

galaxy/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ ADD ./bashrc $GALAXY_HOME/.bashrc
9797

9898
# Install miniconda, then virtualenv from conda and then
9999
# download latest stable release of Galaxy.
100-
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda2-4.5.11-Linux-x86_64.sh -O ~/miniconda.sh && \
100+
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda2-4.5.12-Linux-x86_64.sh -O ~/miniconda.sh && \
101101
/bin/bash ~/miniconda.sh -b -p /tool_deps/_conda/ && \
102102
rm ~/miniconda.sh && \
103103
ln -s /tool_deps/_conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \
@@ -208,7 +208,7 @@ RUN ./scripts/common_startup.sh && \
208208
npm install && \
209209
rm -rf ~/.cache/ /galaxy-central/client/node_modules/ && \
210210
# change the default location of shed_tools to be ../shed_tools
211-
sed -i 's|database|..|' $GALAXY_CONFIG_DIR/shed_tool_conf.xml
211+
sed -i 's|database|..|' $GALAXY_ROOT/config/shed_tool_conf.xml
212212

213213
# Switch back to User root
214214
USER root

0 commit comments

Comments
 (0)