Skip to content

Commit

Permalink
Change mounting location to be outside of home
Browse files Browse the repository at this point in the history
The usermod/groupmod commands, called from entrypoint.sh, cause an
ownership change on all files under /home/builder. This includes the
files mapped into /home/builder/src by the docker mount option.

Moving the mount location outside of home to avoid this potentially
destructive operation having an effect on files outside of docker.
  • Loading branch information
dennisschagt committed Mar 10, 2024
1 parent d134fa9 commit ebb21cd
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions docker/ubuntu_18.04-build-tools.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#
# docker run \
# --rm \
# --mount type=bind,source=$(pwd),target=/home/builder/src \
# --mount type=bind,source=$(pwd),target=/src \
# -e HOST_UID=$(id -u) \
# -e HOST_GID=$(id -g) \
# newsboat-build-tools \
Expand Down Expand Up @@ -77,7 +77,7 @@ RUN apt-get update \
RUN addgroup --gid 1000 builder \
&& adduser --home /home/builder --uid 1000 --ingroup builder \
--disabled-password --shell /bin/bash builder \
&& mkdir -p /home/builder/src \
&& mkdir -p /src \
&& chown -R builder:builder /home/builder

RUN apt-get install locales \
Expand All @@ -90,7 +90,7 @@ ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

USER builder
WORKDIR /home/builder/src
WORKDIR /src

ARG rust_version=1.76.0

Expand Down
6 changes: 3 additions & 3 deletions docker/ubuntu_18.04-i686.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#
# docker run \
# --rm \
# --mount type=bind,source=$(pwd),target=/home/builder/src \
# --mount type=bind,source=$(pwd),target=/src \
# -e HOST_UID=$(id -u) \
# -e HOST_GID=$(id -g) \
# newsboat-i686-build-tools \
Expand Down Expand Up @@ -63,7 +63,7 @@ RUN apt-get update \
RUN addgroup --gid 1000 builder \
&& adduser --home /home/builder --uid 1000 --ingroup builder \
--disabled-password --shell /bin/bash builder \
&& mkdir -p /home/builder/src \
&& mkdir -p /src \
&& chown -R builder:builder /home/builder

RUN apt-get update \
Expand All @@ -77,7 +77,7 @@ ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

USER builder
WORKDIR /home/builder/src
WORKDIR /src

RUN wget -O $HOME/rustup.sh --secure-protocol=TLSv1_2 https://sh.rustup.rs \
&& chmod +x $HOME/rustup.sh \
Expand Down
6 changes: 3 additions & 3 deletions docker/ubuntu_20.04-build-tools.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#
# docker run \
# --rm \
# --mount type=bind,source=$(pwd),target=/home/builder/src \
# --mount type=bind,source=$(pwd),target=/src \
# -e HOST_UID=$(id -u) \
# -e HOST_GID=$(id -g) \
# newsboat-build-tools \
Expand Down Expand Up @@ -77,7 +77,7 @@ RUN apt-get update \
RUN addgroup --gid 1000 builder \
&& adduser --home /home/builder --uid 1000 --ingroup builder \
--disabled-password --shell /bin/bash builder \
&& mkdir -p /home/builder/src \
&& mkdir -p /src \
&& chown -R builder:builder /home/builder

RUN apt-get install locales \
Expand All @@ -90,7 +90,7 @@ ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

USER builder
WORKDIR /home/builder/src
WORKDIR /src

ARG rust_version=1.76.0

Expand Down
6 changes: 3 additions & 3 deletions docker/ubuntu_22.04-build-tools.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#
# docker run \
# --rm \
# --mount type=bind,source=$(pwd),target=/home/builder/src \
# --mount type=bind,source=$(pwd),target=/src \
# -e HOST_UID=$(id -u) \
# -e HOST_GID=$(id -g) \
# newsboat-build-tools \
Expand Down Expand Up @@ -78,7 +78,7 @@ RUN apt-get update \
RUN addgroup --gid 1000 builder \
&& adduser --home /home/builder --uid 1000 --ingroup builder \
--disabled-password --shell /bin/bash builder \
&& mkdir -p /home/builder/src \
&& mkdir -p /src \
&& chown -R builder:builder /home/builder

RUN apt-get install locales \
Expand All @@ -91,7 +91,7 @@ ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

USER builder
WORKDIR /home/builder/src
WORKDIR /src

ARG rust_version=1.76.0

Expand Down
8 changes: 4 additions & 4 deletions docker/ubuntu_23.10-build-tools.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#
# docker run \
# --rm \
# --mount type=bind,source=$(pwd),target=/home/builder/src \
# --mount type=bind,source=$(pwd),target=/src \
# -e HOST_UID=$(id -u) \
# -e HOST_GID=$(id -g) \
# newsboat-build-tools \
Expand Down Expand Up @@ -79,8 +79,8 @@ RUN addgroup builder \
&& deluser ubuntu \
&& adduser --home /home/builder --ingroup builder \
--disabled-password --shell /bin/bash builder \
&& mkdir -p /home/builder/src \
&& chown -R builder:builder /home/builder
&& mkdir -p /src \
&& chown -R builder:builder /src

RUN apt-get install locales \
&& echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen \
Expand All @@ -92,7 +92,7 @@ ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

USER builder
WORKDIR /home/builder/src
WORKDIR /src

ARG rust_version=1.76.0

Expand Down

0 comments on commit ebb21cd

Please sign in to comment.