RFC, SQUASHME: Keep compatibility with existing Dockerfiles

jupyterhub · Nov 20, 2021 · 6268155 · 6268155
1 parent fdac009
commit 6268155
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/repo2docker/buildpacks/base.py b/repo2docker/buildpacks/base.py
@@ -212,6 +212,7 @@ def __init__(self):
         self.log = logging.getLogger("repo2docker")
         self.appendix = ""
         self.labels = {}
+        self.build_src_subdir = "src/"
         if sys.platform.startswith("win"):
             self.log.warning(
                 "Windows environment detected. Note that Windows "
@@ -565,6 +566,8 @@ def _filter_tar(tar):
             tar.gname = ""
             tar.uid = int(build_args.get("NB_UID", DEFAULT_NB_UID))
             tar.gid = int(build_args.get("NB_UID", DEFAULT_NB_UID))
+            if tar.name in ("./Dockerfile", "Dockerfile"):
+                return None
             return tar
 
         for src in sorted(self.get_build_script_files()):
@@ -574,7 +577,7 @@ def _filter_tar(tar):
         for fname in ("repo2docker-entrypoint", "python3-login"):
             tar.add(os.path.join(HERE, fname), fname, filter=_filter_tar)
 
-        tar.add(".", "src/", filter=_filter_tar)
+        tar.add(".", self.build_src_subdir, filter=_filter_tar)
 
         tar.close()
         tarf.seek(0)

diff --git a/repo2docker/buildpacks/docker.py b/repo2docker/buildpacks/docker.py
@@ -7,6 +7,10 @@
 class DockerBuildPack(BuildPack):
     """Docker BuildPack"""
 
+    def __init__(self):
+        super().__init__()
+        self.build_src_subdir = "."
+
     def detect(self):
         """Check if current repo should be built with the Docker BuildPack"""
         return os.path.exists(self.binder_path("Dockerfile"))

diff --git a/tests/dockerfile/binder-dir/binder/Dockerfile b/tests/dockerfile/binder-dir/binder/Dockerfile
@@ -4,8 +4,8 @@ RUN pip install --no-cache notebook
 
 CMD "/bin/sh"
 
-ADD /src/sayhi.sh /usr/local/bin/sayhi.sh
-ADD /src/verify verify
+ADD sayhi.sh /usr/local/bin/sayhi.sh
+ADD verify verify
 
 ARG NB_UID
 ENV HOME /tmp

diff --git a/tests/dockerfile/editable/Dockerfile b/tests/dockerfile/editable/Dockerfile
@@ -4,7 +4,7 @@ RUN pip install --no-cache notebook
 
 CMD "/bin/sh"
 
-ADD /src/change.sh /usr/local/bin/change.sh
+ADD change.sh /usr/local/bin/change.sh
 
 ARG NB_UID
 ENV HOME /tmp

diff --git a/tests/dockerfile/jupyter-stack/Dockerfile b/tests/dockerfile/jupyter-stack/Dockerfile
@@ -1,4 +1,4 @@
 FROM jupyter/base-notebook:b4dd11e16ae4
 
 RUN pip install there
-ADD /src/verify verify
+ADD verify verify
diff --git a/tests/dockerfile/simple/Dockerfile b/tests/dockerfile/simple/Dockerfile
@@ -4,8 +4,8 @@ RUN pip install --no-cache notebook
 
 CMD "/bin/sh"
 
-ADD /src/sayhi.sh /usr/local/bin/sayhi.sh
-ADD /src/verify verify
+ADD sayhi.sh /usr/local/bin/sayhi.sh
+ADD verify verify
 
 ARG NB_UID
 ENV HOME /tmp