diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-08-08 11:07:43 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2021-08-09 08:42:34 -0400 |
| commit | b140e22e2e4e0bb47eea39485a5501497462023a (patch) | |
| tree | 803abe469c025de2d6177e7b842a47182f92ee45 /ci | |
| parent | e65229ee972c113413eeca77853213352129bd47 (diff) | |
| download | libgit2-b140e22e2e4e0bb47eea39485a5501497462023a.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')
| -rw-r--r-- | ci/docker/bionic | 9 | ||||
| -rw-r--r-- | ci/docker/entrypoint.sh | 4 | ||||
| -rw-r--r-- | ci/docker/focal | 9 | ||||
| -rw-r--r-- | ci/docker/xenial | 9 |
4 files changed, 12 insertions, 19 deletions
diff --git a/ci/docker/bionic b/ci/docker/bionic index 85bb6ecae..fb6a34b1c 100644 --- a/ci/docker/bionic +++ b/ci/docker/bionic @@ -36,9 +36,8 @@ RUN cd /tmp && \ cd .. && \ rm -rf mbedtls-2.16.2 -FROM mbedtls 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 mbedtls 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 diff --git a/ci/docker/entrypoint.sh b/ci/docker/entrypoint.sh deleted file mode 100644 index 8d96e3acd..000000000 --- a/ci/docker/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -e -useradd --shell /bin/bash libgit2 -chown --recursive libgit2:libgit2 /home/libgit2 -exec sudo --preserve-env --set-home --user=libgit2 "$@" 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 diff --git a/ci/docker/xenial b/ci/docker/xenial index 1c8e585d2..d2ba0313f 100644 --- a/ci/docker/xenial +++ b/ci/docker/xenial @@ -59,9 +59,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 |