summaryrefslogtreecommitdiff
path: root/ci/docker/focal
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2021-08-08 11:07:43 -0400
committerEdward Thomson <ethomson@edwardthomson.com>2021-08-09 08:42:34 -0400
commitb140e22e2e4e0bb47eea39485a5501497462023a (patch)
tree803abe469c025de2d6177e7b842a47182f92ee45 /ci/docker/focal
parente65229ee972c113413eeca77853213352129bd47 (diff)
downloadlibgit2-ethomson/dockerfile.tar.gz
ci: remove the docker entrypointethomson/dockerfile
Omitting an entrypoint.sh to configure the container and instead depending on docker primitives allows us to be more portable. (If a distribution uses a different mechanism for adding users, we need not have multiple entrypoint.sh files or invariants within it; instead we can configure that in the dockerfile itself along with all the other distribution specific components.)
Diffstat (limited to 'ci/docker/focal')
-rw-r--r--ci/docker/focal9
1 files changed, 4 insertions, 5 deletions
diff --git a/ci/docker/focal b/ci/docker/focal
index ce9726877..c0c57f640 100644
--- a/ci/docker/focal
+++ b/ci/docker/focal
@@ -72,9 +72,8 @@ RUN cd /tmp && \
cd .. && \
rm -rf valgrind-3.15.0
-FROM valgrind AS configure
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN chmod a+x /usr/local/bin/entrypoint.sh
-RUN mkdir /var/run/sshd
+FROM valgrind AS adduser
+RUN useradd --shell /bin/bash libgit2 --create-home
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+FROM adduser AS configure
+RUN mkdir /var/run/sshd