Skip to content
Snippets Groups Projects
Commit 505b23c3 authored by Joseph Weston's avatar Joseph Weston
Browse files

correct environment loading in Dockerfile

parent ea566fb3
No related branches found
No related tags found
No related merge requests found
Pipeline #22155 failed
Stage: build-env
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
Dockerfile
+ 3
− 3
View file @ 505b23c3
...@@ -21,8 +21,7 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.5.11-Linux-x86 ...@@ -21,8 +21,7 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.5.11-Linux-x86
rm ~/miniconda.sh && \ rm ~/miniconda.sh && \
/opt/conda/bin/conda clean -tipsy && \ /opt/conda/bin/conda clean -tipsy && \
ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \
echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc
echo "conda activate base" >> ~/.bashrc
ENV TINI_VERSION v0.16.1 ENV TINI_VERSION v0.16.1
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
...@@ -32,7 +31,8 @@ RUN mkdir /environments ...@@ -32,7 +31,8 @@ RUN mkdir /environments
COPY environment.yml /environments/ COPY environment.yml /environments/
RUN conda-env create -f /environments/environment.yml && \ RUN conda-env create -f /environments/environment.yml && \
echo "conda activate revtex-markdown-paper" >> ~/.bashrc # ensure that we activate the environment in any shell (Gitlab CI uses 'sh')
echo ". activate revtex-markdown-paper" >> /etc/profile
ENTRYPOINT [ "/usr/bin/tini", "--" ] ENTRYPOINT [ "/usr/bin/tini", "--" ]
CMD [ "/bin/bash" ] CMD [ "/bin/bash" ]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment