From 0c9819f5e6f3e313588c51b2f34bc1333236c6d4 Mon Sep 17 00:00:00 2001
From: Wes Turner <50891+westurner@users.noreply.github.com>
Date: Wed, 15 Jan 2025 08:18:56 -0500
Subject: [PATCH 1/2] BUG: COPY --chmod=0755
 /usr/local/bin/{python3-login,repo2docker-entrypoint} to support rootless
 podman

Command this is building with (though repo2podman doesn't yet support volumes)

```sh
repo2docker --engine=podman -E -P --debug -e NB_USER=jovyan -e NB_UID=1000 --user-name=jovyan .
```
---
 repo2docker/buildpacks/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/repo2docker/buildpacks/base.py b/repo2docker/buildpacks/base.py
index d3e8ec40..24555fb0 100644
--- a/repo2docker/buildpacks/base.py
+++ b/repo2docker/buildpacks/base.py
@@ -186,8 +186,8 @@
 
 # Add entrypoint
 ENV PYTHONUNBUFFERED=1
-COPY /python3-login /usr/local/bin/python3-login
-COPY /repo2docker-entrypoint /usr/local/bin/repo2docker-entrypoint
+COPY --chmod=0755 /python3-login /usr/local/bin/python3-login
+COPY --chmod=0755 /repo2docker-entrypoint /usr/local/bin/repo2docker-entrypoint
 ENTRYPOINT ["/usr/local/bin/repo2docker-entrypoint"]
 
 # Specify the default command to run

From f16569ac148141c8bee506cca4bd40dbfba18145 Mon Sep 17 00:00:00 2001
From: Wes Turner <50891+westurner@users.noreply.github.com>
Date: Wed, 15 Jan 2025 08:41:11 -0500
Subject: [PATCH 2/2] REF: workaround docker without buildkit's lack of COPY
 --chmod support

---
 repo2docker/buildpacks/base.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/repo2docker/buildpacks/base.py b/repo2docker/buildpacks/base.py
index 24555fb0..0743a72a 100644
--- a/repo2docker/buildpacks/base.py
+++ b/repo2docker/buildpacks/base.py
@@ -186,8 +186,11 @@
 
 # Add entrypoint
 ENV PYTHONUNBUFFERED=1
-COPY --chmod=0755 /python3-login /usr/local/bin/python3-login
-COPY --chmod=0755 /repo2docker-entrypoint /usr/local/bin/repo2docker-entrypoint
+COPY /python3-login /usr/local/bin/python3-login
+COPY /repo2docker-entrypoint /usr/local/bin/repo2docker-entrypoint
+USER root
+RUN chmod 0755 /usr/local/bin/python3-login /usr/local/bin/repo2docker-entrypoint
+USER ${NB_USER}
 ENTRYPOINT ["/usr/local/bin/repo2docker-entrypoint"]
 
 # Specify the default command to run