fix conda env and docker build (#92)

* fix conda env and docker build * Update {{cookiecutter.project_repo_name}}/Dockerfile Co-authored-by: Trevor James Smith <[email protected]> * added pypws version range Co-authored-by: Trevor James Smith <[email protected]>
bird-house · Jun 17, 2020 · 317c4fb · 317c4fb
1 parent 90bbb15
commit 317c4fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/{{cookiecutter.project_repo_name}}/Dockerfile b/{{cookiecutter.project_repo_name}}/Dockerfile
@@ -16,11 +16,11 @@ COPY . /opt/wps
 
 WORKDIR /opt/wps
 
-# Create conda environment
-RUN conda env create -n wps -f environment.yml
+# Create conda environment with PyWPS
+RUN conda create -n wps -c conda-forge python=3.7 pywps=4.2
 
 # Install WPS
-RUN ["/bin/bash", "-c", "source activate wps && python setup.py develop"]
+RUN ["/bin/bash", "-c", "source activate wps && python setup.py install"]
 
 # Start WPS service on port {{ cookiecutter.http_port }} on 0.0.0.0
 EXPOSE {{ cookiecutter.http_port }}

diff --git a/{{cookiecutter.project_repo_name}}/environment.yml b/{{cookiecutter.project_repo_name}}/environment.yml
@@ -1,10 +1,11 @@
 name: {{ cookiecutter.project_slug }}
 channels:
-#- conda-forge
+- conda-forge
 - defaults
 dependencies:
 - pip
-- pywps>=4.2
+- python>=3.6,<3.8
+- pywps>=4.2.4,<4.3
 - jinja2
 - click
 - psutil