From ab5f979a952a30cf24c0a8be6f1ef2bb45f44092 Mon Sep 17 00:00:00 2001
From: Joshua Shreve <j.a.shreve@gmail.com>
Date: Sun, 17 Oct 2021 16:10:02 -0400
Subject: Fixed error due to package requirement issue

one of the packages required by cadquery was improperly configured and causes issues with the cadquery import.  Had to change docker base image and modify to include a configured environment to work around the issue.  May require rebuilding or removing and recreating your docker image and containers.

If you continue to encounter an import error please contact me.
---
 docker/Dockerfile      | 23 ++++++++++++++---------
 docker/environment.yml | 28 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 docker/environment.yml

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
-- 
cgit v1.2.3