diff options
| author | Joshua Shreve <j.a.shreve@gmail.com> | 2021-10-22 20:37:28 -0400 |
|---|---|---|
| committer | Joshua Shreve <j.a.shreve@gmail.com> | 2021-10-22 20:37:28 -0400 |
| commit | 37cd60e784f9ff9887b17eb7bdfdcd78578b5698 (patch) | |
| tree | 00316b835ea9826fbc93c6d95b111848556eca93 | |
| parent | b64d5b8009a4846f2743e417dac9a8a05b93a045 (diff) | |
| parent | e18d4dc3aff6691074c3469fb1054dbb4dde9f49 (diff) | |
Merge branch 'master' into dev
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/environment.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 1065776..ab7d85b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,8 +15,6 @@ 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 diff --git a/docker/environment.yml b/docker/environment.yml index fb3480a..48beacd 100644 --- a/docker/environment.yml +++ b/docker/environment.yml @@ -26,3 +26,5 @@ dependencies: - numpy=1 - scipy=1 - cadquery + - pip: + - solidpython |