diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2022-04-20 14:20:39 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2022-04-20 14:45:52 -0400 |
| commit | 926efbd296dc5d80cc04fd6a0dfc4e7726d5799c (patch) | |
| tree | 45982e4b75705a5c9e4c643e78e5224bb6a21c2a /ci | |
| parent | 00612f79171f2e8b13afbaf15be0ced829c821c9 (diff) | |
| download | libgit2-926efbd296dc5d80cc04fd6a0dfc4e7726d5799c.tar.gz | |
ci: use the runner's uid/gid
Use the runner's uid/gid for the containers for sanity when sharing
files across volumes.
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/docker/bionic | 7 | ||||
| -rw-r--r-- | ci/docker/centos7 | 7 | ||||
| -rw-r--r-- | ci/docker/centos8 | 7 | ||||
| -rw-r--r-- | ci/docker/focal | 8 | ||||
| -rw-r--r-- | ci/docker/xenial | 8 |
5 files changed, 32 insertions, 5 deletions
diff --git a/ci/docker/bionic b/ci/docker/bionic index 51af5c01c..52832f3d3 100644 --- a/ci/docker/bionic +++ b/ci/docker/bionic @@ -38,7 +38,12 @@ RUN cd /tmp && \ rm -rf mbedtls-2.16.2 FROM mbedtls AS adduser -RUN useradd --shell /bin/bash libgit2 --create-home +ARG UID="" +ARG GID="" +RUN if [ "${UID}" != "" ]; then USER_ARG="--uid ${UID}"; fi && \ + if [ "${GID}" != "" ]; then GROUP_ARG="--gid ${GID}"; fi && \ + groupadd ${GROUP_ARG} libgit2 && \ + useradd ${USER_ARG} --gid libgit2 --shell /bin/bash --create-home libgit2 FROM adduser AS configure RUN mkdir /var/run/sshd diff --git a/ci/docker/centos7 b/ci/docker/centos7 index 8105f1442..28ed65081 100644 --- a/ci/docker/centos7 +++ b/ci/docker/centos7 @@ -48,7 +48,12 @@ RUN cd /tmp && \ rm -rf cmake-3.21.1 FROM cmake AS adduser -RUN useradd --shell /bin/bash libgit2 --create-home +ARG UID="" +ARG GID="" +RUN if [ "${UID}" != "" ]; then USER_ARG="--uid ${UID}"; fi && \ + if [ "${GID}" != "" ]; then GROUP_ARG="--gid ${GID}"; fi && \ + groupadd ${GROUP_ARG} libgit2 && \ + useradd ${USER_ARG} --gid libgit2 --shell /bin/bash --create-home libgit2 FROM adduser AS configure ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig diff --git a/ci/docker/centos8 b/ci/docker/centos8 index cca088103..823a46590 100644 --- a/ci/docker/centos8 +++ b/ci/docker/centos8 @@ -40,7 +40,12 @@ RUN cd /tmp && \ rm -rf valgrind-3.15.0 FROM valgrind AS adduser -RUN useradd --shell /bin/bash libgit2 --create-home +ARG UID="" +ARG GID="" +RUN if [ "${UID}" != "" ]; then USER_ARG="--uid ${UID}"; fi && \ + if [ "${GID}" != "" ]; then GROUP_ARG="--gid ${GID}"; fi && \ + groupadd ${GROUP_ARG} libgit2 && \ + useradd ${USER_ARG} --gid libgit2 --shell /bin/bash --create-home libgit2 FROM adduser AS configure ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig diff --git a/ci/docker/focal b/ci/docker/focal index 37d7d6356..8061237d7 100644 --- a/ci/docker/focal +++ b/ci/docker/focal @@ -73,7 +73,13 @@ RUN cd /tmp && \ rm -rf valgrind-3.15.0 FROM valgrind AS adduser -RUN useradd --shell /bin/bash libgit2 --create-home +ARG UID="" +ARG GID="" +RUN if [ "${UID}" != "" ]; then USER_ARG="--uid ${UID}"; fi && \ + if [ "${GID}" != "" ]; then GROUP_ARG="--gid ${GID}"; fi && \ + groupadd ${GROUP_ARG} libgit2 && \ + useradd ${USER_ARG} --gid libgit2 --shell /bin/bash --create-home libgit2 + FROM adduser AS configure RUN mkdir /var/run/sshd diff --git a/ci/docker/xenial b/ci/docker/xenial index c19fe421d..c9791462f 100644 --- a/ci/docker/xenial +++ b/ci/docker/xenial @@ -60,7 +60,13 @@ RUN cd /tmp && \ rm -rf valgrind-3.15.0 FROM valgrind AS adduser -RUN useradd --shell /bin/bash libgit2 --create-home +ARG UID="" +ARG GID="" +RUN if [ "${UID}" != "" ]; then USER_ARG="--uid ${UID}"; fi && \ + if [ "${GID}" != "" ]; then GROUP_ARG="--gid ${GID}"; fi && \ + groupadd ${GROUP_ARG} libgit2 && \ + useradd ${USER_ARG} --gid libgit2 --shell /bin/bash --create-home libgit2 + FROM adduser AS configure RUN mkdir /var/run/sshd |