Skip to content

Commit

Permalink
Merge pull request #1220 from chrisjonesBSU/docker
Browse files Browse the repository at this point in the history
Fix and update Dockerfile
  • Loading branch information
chrisjonesBSU authored Feb 5, 2025
2 parents 8dc9f1d + 519dde9 commit 503eafb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
12 changes: 5 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ARG PY_VERSION=3.10
FROM continuumio/miniconda3:4.10.3-alpine AS builder
FROM continuumio/miniconda3:23.5.2-0-alpine AS builder

EXPOSE 8888

Expand All @@ -21,12 +20,11 @@ RUN apk update && apk add libarchive &&\
conda update conda -yq && \
conda config --set always_yes yes --set changeps1 no && \
. /opt/conda/etc/profile.d/conda.sh && \
sed -i -E "s/python.*$/python="$(PY_VERSION)"/" environment-dev.yml && \
conda install -c conda-forge mamba && \
mamba env create --file environment-dev.yml && \
conda install -c conda-forge mamba git && \
mamba env create --file environment-dev.yml python=3.12 && \
conda activate mbuild-dev && \
mamba install -c conda-forge jupyter python="$PY_VERSION" && \
python setup.py install && \
mamba install -c conda-forge jupyter && \
pip install -e .&& \
echo "source activate mbuild-dev" >> \
/home/anaconda/.profile && \
conda clean -afy && \
Expand Down
2 changes: 1 addition & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
- pytest
- garnett>=0.7.1
- openbabel>=3.0.0
- openff-toolkit-base >=0.11
- openff-toolkit-base >=0.11,<0.16.7
- openmm
- gsd>=2.9
- parmed>=3.4.3
Expand Down

0 comments on commit 503eafb

Please sign in to comment.