Merge pull request #49 from yuvipanda/conda-cache

Cleanup conda

repo2docker/detectors.py

@@ -54,6 +54,7 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+{% if packages -%}
 RUN apt-get update && \
     apt-get install --yes \
        {% for package in packages -%}
@@ -62,6 +63,7 @@ RUN apt-get update && \
     && apt-get purge && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
+{% endif -%}
 
 EXPOSE 8888
 
@@ -362,8 +364,21 @@ class BuildPack(LoggingConfigurable):
             io.BytesIO(dockerfile)
         )
 
+        def _filter_tar(tar):
+            # We need to unset these for build_script_files we copy into tar
+            # Otherwise they seem to vary each time, preventing effective use
+            # of the cache!
+            # https://github.com/docker/docker-py/pull/1582 is related
+            tar.uname = ''
+            tar.gname = ''
+            tar.uid = 1000
+            tar.gid = 1000
+            return tar
+
         for src in sorted(self.build_script_files):
-            tar.add(src)
+            src_parts = src.split('/')
+            src_path = os.path.join(os.path.dirname(__file__), 'files', *src_parts)
+            tar.add(src_path, src, filter=_filter_tar)
 
         tar.add('.', 'src/')
 
@@ -512,8 +527,8 @@ class CondaBuildPack(BuildPack):
     path = ['${CONDA_DIR}/bin']
 
     build_script_files = {
-        os.path.join(os.path.dirname(__file__), 'files', 'conda', 'install-miniconda.bash'): '/tmp/install-miniconda.bash',
-        os.path.join(os.path.dirname(__file__), 'files', 'conda', 'environment.yml'): '/tmp/environment.yml',
+        'conda/install-miniconda.bash': '/tmp/install-miniconda.bash',
+        'conda/environment.yml': '/tmp/environment.yml'
     }
 
     build_scripts = [
@@ -537,6 +552,11 @@ class CondaBuildPack(BuildPack):
                 conda clean -tipsy
                 """
             ))
+        if os.path.exists('requirements.txt'):
+            assembly_scripts.append((
+                '${NB_USER}',
+                'pip install --no-cache-dir -r requirements.txt'
+            ))
         return assembly_scripts
 
     def detect(self):

tests/conda/requirements/environment.yml

@@ -0,0 +1,2 @@
+dependencies:
+  - numpy

tests/conda/requirements/requirements.txt

@@ -0,0 +1 @@
+there

tests/conda/requirements/verify

@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+import sys
+
+assert sys.version_info[:2] == (3, 6)
+
+import numpy
+import there