diff --git a/blackdynamite/Dockerfile b/blackdynamite/Dockerfile index 47a1c4d..d572af1 100644 --- a/blackdynamite/Dockerfile +++ b/blackdynamite/Dockerfile @@ -1,50 +1,49 @@ # For finding latest versions of the base image see # https://github.com/SwissDataScienceCenter/renkulab-docker ARG RENKU_BASE_IMAGE=renku/renkulab-py:3.9-0.12.0 FROM ${RENKU_BASE_IMAGE} # Uncomment and adapt if code is to be included in the image # COPY src /code/src # Uncomment and adapt if your R or python packages require extra linux (ubuntu) software # e.g. the following installs apt-utils and vim; each pkg on its own line, all lines # except for the last end with backslash '\' to continue the RUN line # # USER root # RUN apt-get update && \ # apt-get install -y --no-install-recommends \ # apt-utils \ # vim # USER ${NB_USER} # install the python dependencies -COPY requirements.txt environment.yml /tmp/ -RUN conda env update -q -f /tmp/environment.yml && \ - /opt/conda/bin/pip install -r /tmp/requirements.txt && \ +COPY requirements.txt /tmp/ +RUN /opt/conda/bin/pip install -r /tmp/requirements.txt && \ conda clean -y --all && \ conda env export -n "root" # RENKU_VERSION determines the version of the renku CLI # that will be used in this image. To find the latest version, # visit https://pypi.org/project/renku/#history. ARG RENKU_VERSION={{ __renku_version__ | default("1.6.0") }} ######################################################## # Do not edit this section and do not add anything below # Install renku from pypi or from github if it's a dev version RUN if [ -n "$RENKU_VERSION" ] ; then \ source .renku/venv/bin/activate ; \ currentversion=$(renku --version) ; \ if [ "$RENKU_VERSION" != "$currentversion" ] ; then \ pip uninstall renku -y ; \ gitversion=$(echo "$RENKU_VERSION" | sed -n "s/^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\(rc[[:digit:]]\+\)*\(\.dev[[:digit:]]\+\)*\(+g\([a-f0-9]\+\)\)*\(+dirty\)*$/\4/p") ; \ if [ -n "$gitversion" ] ; then \ pip install --force "git+https://github.com/SwissDataScienceCenter/renku-python.git@$gitversion" ;\ else \ pip install --force renku==${RENKU_VERSION} ;\ fi \ fi \ fi ########################################################