summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJoshua Shreve <j.a.shreve@gmail.com>2021-10-17 16:10:39 -0400
committerJoshua Shreve <j.a.shreve@gmail.com>2021-10-17 16:10:39 -0400
commit3697d6a2002d53d94856c38d0ff20d0d5c8a205e (patch)
tree53639dc4578292d1f3c4869c1f339b3ef7c87030 /docker
parent45d615ba2b670096c0f7560745bce0befc1fe103 (diff)
parentab5f979a952a30cf24c0a8be6f1ef2bb45f44092 (diff)
Merge branch 'master' into dev
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile23
-rw-r--r--docker/environment.yml28
2 files changed, 42 insertions, 9 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9b43f7d..1065776 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,18 +1,23 @@
-FROM mambaorg/micromamba:0.8.2
+FROM continuumio/miniconda3
RUN apt-get update && \
apt-get install -y libgl1-mesa-glx gcc bash && \
rm -rf /var/lib/apt/lists/*
-WORKDIR /app
-RUN micromamba install -y -n base -c conda-forge -c cadquery \
- python=3 \
- cadquery=master \
- numpy=1 \
- scipy=1 && \
- (rm /opt/conda/pkgs/cache/* || true)
+
+COPY ./docker/environment.yml .
+
+RUN conda env create -f environment.yml
+
+RUN conda init bash
+
+SHELL ["bash", "-lc"]
+
+RUN conda activate myenv
RUN pip3 install solidpython
+RUN echo "source activate myenv" >> ~/.bashrc
+ENV PATH /opt/conda/envs/myenv/bin:$PATH
-WORKDIR /app/src \ No newline at end of file
+WORKDIR /app/src
diff --git a/docker/environment.yml b/docker/environment.yml
new file mode 100644
index 0000000..fb3480a
--- /dev/null
+++ b/docker/environment.yml
@@ -0,0 +1,28 @@
+name: myenv
+channels:
+ - cadquery
+ - conda-forge
+ - defaults
+dependencies:
+ - python>=3.6
+ - ipython
+ - ocp=7.5.1
+ - pyparsing
+ - sphinx=3.2.1
+ - sphinx_rtd_theme
+ - sphinx-autodoc-typehints
+ - black=19.10b0
+ - mypy
+ - codecov
+ - pytest
+ - pytest-cov
+ - ezdxf
+ - ipython
+ - typing_extensions
+ - nptyping
+ - nlopt
+ - path
+ - pip
+ - numpy=1
+ - scipy=1
+ - cadquery