Commit 926efbd2 by Edward Thomson

ci: use the runner's uid/gid

Use the runner's uid/gid for the containers for sanity when sharing
files across volumes.
parent 00612f79
...@@ -69,7 +69,7 @@ jobs: ...@@ -69,7 +69,7 @@ jobs:
if [ "${{ matrix.container.base }}" != "" ]; then if [ "${{ matrix.container.base }}" != "" ]; then
BASE_ARG="--build-arg BASE=${{ matrix.container.base }}" BASE_ARG="--build-arg BASE=${{ matrix.container.base }}"
fi fi
docker build -t ${{ env.docker-registry-container-sha }} ${BASE_ARG} -f ${{ env.dockerfile }} . docker build -t ${{ env.docker-registry-container-sha }} --build-arg UID=$(id -u) --build-arg GID=$(id -g) ${BASE_ARG} -f ${{ env.dockerfile }} .
docker tag ${{ env.docker-registry-container-sha }} ${{ env.docker-registry-container-latest }} docker tag ${{ env.docker-registry-container-sha }} ${{ env.docker-registry-container-latest }}
docker push ${{ env.docker-registry-container-sha }} docker push ${{ env.docker-registry-container-sha }}
docker push ${{ env.docker-registry-container-latest }} docker push ${{ env.docker-registry-container-latest }}
......
...@@ -38,7 +38,12 @@ RUN cd /tmp && \ ...@@ -38,7 +38,12 @@ RUN cd /tmp && \
rm -rf mbedtls-2.16.2 rm -rf mbedtls-2.16.2
FROM mbedtls AS adduser 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 FROM adduser AS configure
RUN mkdir /var/run/sshd RUN mkdir /var/run/sshd
...@@ -48,7 +48,12 @@ RUN cd /tmp && \ ...@@ -48,7 +48,12 @@ RUN cd /tmp && \
rm -rf cmake-3.21.1 rm -rf cmake-3.21.1
FROM cmake AS adduser 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 FROM adduser AS configure
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig
......
...@@ -40,7 +40,12 @@ RUN cd /tmp && \ ...@@ -40,7 +40,12 @@ RUN cd /tmp && \
rm -rf valgrind-3.15.0 rm -rf valgrind-3.15.0
FROM valgrind AS adduser 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 FROM adduser AS configure
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig
......
...@@ -73,7 +73,13 @@ RUN cd /tmp && \ ...@@ -73,7 +73,13 @@ RUN cd /tmp && \
rm -rf valgrind-3.15.0 rm -rf valgrind-3.15.0
FROM valgrind AS adduser 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 FROM adduser AS configure
RUN mkdir /var/run/sshd RUN mkdir /var/run/sshd
...@@ -60,7 +60,13 @@ RUN cd /tmp && \ ...@@ -60,7 +60,13 @@ RUN cd /tmp && \
rm -rf valgrind-3.15.0 rm -rf valgrind-3.15.0
FROM valgrind AS adduser 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 FROM adduser AS configure
RUN mkdir /var/run/sshd RUN mkdir /var/run/sshd
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment