Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Removed conda-build from default environment because it was wreaking …
Browse files Browse the repository at this point in the history
…havoc on vs code terminals. Also improved the Dockerfile so that conda-build doesn't have to be in the swiftest-env environment
  • Loading branch information
daminton committed Jul 31, 2023
1 parent b2439e7 commit 5e57497
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
20 changes: 9 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -136,20 +136,18 @@ ENV SHELL="/bin/bash"
ENV PATH="/opt/conda/bin:${PATH}"
ENV LD_LIBRARY_PATH="/usr/local/lib"

COPY --from=build_driver /usr/local/bin/swiftest_driver /opt/conda/bin/swiftest_driver
COPY ./python/. /opt/conda/pkgs/
COPY environment.yml .

RUN conda update --all -y && \
conda install conda-libmamba-solver -y && \
conda config --set solver libmamba

COPY environment.yml .
RUN conda env create -f environment.yml && \
conda config --set solver libmamba && \
conda install conda-build -y && \
conda env create -f environment.yml && \
cd /opt/conda/pkgs/swiftest && conda develop . --name swiftest-env && \
conda init bash && \
echo "conda activate swiftest-env" >> ~/.bashrc

COPY ./python/. /opt/conda/pkgs/
COPY --from=build_driver /usr/local/bin/swiftest_driver /opt/conda/bin/swiftest_driver

# Start new shell to activate the environment and install Swiftest
RUN cd /opt/conda/pkgs/swiftest && conda develop . && \
echo "conda activate swiftest-env" >> ~/.bashrc && \
conda clean --all -y && \
mkdir -p /.astropy && \
chmod -R 777 /.astropy && \
Expand Down
3 changes: 1 addition & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ dependencies:
- astroquery>=0.4.6
- tqdm>=4.65.0
- x264>=1!157.20191217
- ffmpeg>=4.3.2
- conda-build
- ffmpeg>=4.3.2

0 comments on commit 5e57497

Please sign in to comment.