Merge 4c81d14 into 0573564

newsboat · Mar 10, 2024 · a91495c · a91495c
2 parents 0573564 + 4c81d14
commit a91495c
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 34 deletions.
diff --git a/docker/code-formatting-tools.dockerfile b/docker/code-formatting-tools.dockerfile
@@ -9,7 +9,7 @@
 #   docker build \
 #       --tag=newsboat-code-formatting-tools \
 #       --file=docker/code-formatting-tools.dockerfile \
-#       docker
+#       .
 #
 # Run on your local files with:
 #

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+USER_ID=${HOST_UID:-1000}
+GROUP_ID=${HOST_GID:-1000}
+
+echo "Starting with UID: $USER_ID, GID: $GROUP_ID"
+usermod -u $USER_ID builder
+groupmod -g $GROUP_ID builder
+
+exec /usr/sbin/gosu builder "$@"
diff --git a/docker/i18nspector.dockerfile b/docker/i18nspector.dockerfile
@@ -6,7 +6,7 @@
 #   docker build \
 #       --tag=newsboat-i18nspector \
 #       --file=docker/i18nspector.dockerfile \
-#       docker
+#       .
 #
 # Run on your local files:
 #

diff --git a/docker/ubuntu_18.04-build-tools.dockerfile b/docker/ubuntu_18.04-build-tools.dockerfile
@@ -15,7 +15,7 @@
 #   docker build \
 #       --tag=newsboat-build-tools \
 #       --file=docker/ubuntu_18.04-build-tools.dockerfile \
-#       docker
+#       .
 #
 # Build with non-default compiler and Rust version:
 #
@@ -26,7 +26,7 @@
 #       --build-arg cc=clang-7 \
 #       --build-arg cxx=clang++-7 \
 #       --build-arg rust_version=1.26.1 \
-#       docker
+#       .
 #
 # Before building in a container, run this to remove any binaries that you
 # might've compiled on your host system (or in another container):
@@ -37,8 +37,10 @@
 #
 #   docker run \
 #       --rm \
-#       --mount type=bind,source=$(pwd),target=/home/builder/src \
-#       --user $(id -u):$(id -g) \
+#       --mount type=bind,source=$(pwd),target=/src \
+#       --user root
+#       -e HOST_UID=$(id -u) \
+#       -e HOST_GID=$(id -g) \
 #       newsboat-build-tools \
 #       make
 #
@@ -69,14 +71,14 @@ RUN apt-get update \
     && apt-get install --assume-yes --no-install-recommends \
         build-essential $cxx_package libsqlite3-dev libcurl4-openssl-dev libssl-dev \
         libxml2-dev libstfl-dev libjson-c-dev libncursesw5-dev gettext git \
-        asciidoctor wget \
+        asciidoctor wget gosu \
     && apt-get autoremove \
     && apt-get clean
 
 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 \
@@ -89,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
 
@@ -107,3 +109,11 @@ ARG cxx=g++-8
 
 ENV CC=$cc
 ENV CXX=$cxx
+
+USER root
+COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
+# Cirrus doesn't run the entrypoint script so we switch directly to the target user.
+USER builder
diff --git a/docker/ubuntu_18.04-i686.dockerfile b/docker/ubuntu_18.04-i686.dockerfile
@@ -5,7 +5,7 @@
 #   docker build \
 #       --tag=newsboat-i686-build-tools \
 #       --file=docker/ubuntu_18.04-i686.dockerfile \
-#       docker
+#       .
 #
 # Before building in a container, run this to remove any binaries that you
 # might've compiled on your host system (or in another container):
@@ -16,8 +16,10 @@
 #
 #   docker run \
 #       --rm \
-#       --mount type=bind,source=$(pwd),target=/home/builder/src \
-#       --user $(id -u):$(id -g) \
+#       --mount type=bind,source=$(pwd),target=/src \
+#       --user root
+#       -e HOST_UID=$(id -u) \
+#       -e HOST_GID=$(id -g) \
 #       newsboat-i686-build-tools \
 #       make
 #
@@ -54,15 +56,15 @@ RUN apt-get update \
         # `curl` would be enough for our needs, but it pulls in amd64 versions
         # of libraries we use, interfering with the build environment. So
         # `wget` it is.
-        wget \
+        wget gosu \
     && apt-get install --assume-yes --no-install-recommends asciidoctor \
     && apt-get autoremove \
     && apt-get clean
 
 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 \
@@ -76,7 +78,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 \
@@ -86,3 +88,11 @@ RUN wget -O $HOME/rustup.sh --secure-protocol=TLSv1_2 https://sh.rustup.rs \
     && chmod a+w $HOME/.cargo
 
 ENV HOME /home/builder
+
+USER root
+COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
+# Cirrus doesn't run the entrypoint script so we switch directly to the target user.
+USER builder
diff --git a/docker/ubuntu_20.04-build-tools.dockerfile b/docker/ubuntu_20.04-build-tools.dockerfile
@@ -15,7 +15,7 @@
 #   docker build \
 #       --tag=newsboat-build-tools \
 #       --file=docker/ubuntu_20.04-build-tools.dockerfile \
-#       docker
+#       .
 #
 # Build with non-default compiler and Rust version:
 #
@@ -26,7 +26,7 @@
 #       --build-arg cc=clang-10 \
 #       --build-arg cxx=clang++-10 \
 #       --build-arg rust_version=1.40.0 \
-#       docker
+#       .
 #
 # Before building in a container, run this to remove any binaries that you
 # might've compiled on your host system (or in another container):
@@ -37,8 +37,10 @@
 #
 #   docker run \
 #       --rm \
-#       --mount type=bind,source=$(pwd),target=/home/builder/src \
-#       --user $(id -u):$(id -g) \
+#       --mount type=bind,source=$(pwd),target=/src \
+#       --user root
+#       -e HOST_UID=$(id -u) \
+#       -e HOST_GID=$(id -g) \
 #       newsboat-build-tools \
 #       make
 #
@@ -69,14 +71,14 @@ RUN apt-get update \
     && apt-get install --assume-yes --no-install-recommends \
         build-essential $cxx_package libsqlite3-dev libcurl4-openssl-dev libssl-dev \
         libxml2-dev libstfl-dev libjson-c-dev libncursesw5-dev gettext git \
-        pkg-config zlib1g-dev asciidoctor wget \
+        pkg-config zlib1g-dev asciidoctor wget gosu \
     && apt-get autoremove \
     && apt-get clean
 
 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 \
@@ -89,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
 
@@ -107,3 +109,11 @@ ARG cxx=g++-9
 
 ENV CC=$cc
 ENV CXX=$cxx
+
+USER root
+COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
+# Cirrus doesn't run the entrypoint script so we switch directly to the target user.
+USER builder
diff --git a/docker/ubuntu_22.04-build-tools.dockerfile b/docker/ubuntu_22.04-build-tools.dockerfile
@@ -15,7 +15,7 @@
 #   docker build \
 #       --tag=newsboat-build-tools \
 #       --file=docker/ubuntu_22.04-build-tools.dockerfile \
-#       docker
+#       .
 #
 # Build with non-default compiler and Rust version:
 #
@@ -26,7 +26,7 @@
 #       --build-arg cc=clang-13 \
 #       --build-arg cxx=clang++-13 \
 #       --build-arg rust_version=1.40.0 \
-#       docker
+#       .
 #
 # Before building in a container, run this to remove any binaries that you
 # might've compiled on your host system (or in another container):
@@ -37,8 +37,10 @@
 #
 #   docker run \
 #       --rm \
-#       --mount type=bind,source=$(pwd),target=/home/builder/src \
-#       --user $(id -u):$(id -g) \
+#       --mount type=bind,source=$(pwd),target=/src \
+#       --user root
+#       -e HOST_UID=$(id -u) \
+#       -e HOST_GID=$(id -g) \
 #       newsboat-build-tools \
 #       make
 #
@@ -70,14 +72,14 @@ RUN apt-get update \
     && apt-get install --assume-yes --no-install-recommends \
         build-essential $cxx_package libsqlite3-dev libcurl4-openssl-dev libssl-dev \
         libxml2-dev libstfl-dev libjson-c-dev libncursesw5-dev gettext git \
-        pkg-config zlib1g-dev asciidoctor \
+        pkg-config zlib1g-dev asciidoctor gosu \
     && apt-get autoremove \
     && apt-get clean
 
 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 \
@@ -90,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
 
@@ -108,3 +110,11 @@ ARG cxx=g++-12
 
 ENV CC=$cc
 ENV CXX=$cxx
+
+USER root
+COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
+# Cirrus doesn't run the entrypoint script so we switch directly to the target user.
+USER builder
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/docker/ubuntu_23.10-build-tools.dockerfile b/docker/ubuntu_23.10-build-tools.dockerfile
@@ -10,7 +10,52 @@
 # - cxx -- C++ compiler to use. This gets copied into CXX environment variable.
 #       Default: g++-13
 #
-# For now, this Dockerfile can only be used in our CI.
+# Build with defaults:
+#
+# docker build \
+#     --tag=newsboat-build-tools \
+#     --file=docker/ubuntu_23.10-build-tools.dockerfile \
+#     .
+#
+# Build with non-default compiler and Rust version:
+#
+#   docker build \
+#       --tag=newsboat-build-tools \
+#       --file=docker/ubuntu_23.10-build-tools.dockerfile \
+#       --build-arg cxx_package=clang-16 \
+#       --build-arg cc=clang-16 \
+#       --build-arg cxx=clang++-16 \
+#       --build-arg rust_version=1.76.0 \
+#       .
+#
+# Before building in a container, run this to remove any binaries that you
+# might've compiled on your host system (or in another container):
+#
+#   make distclean
+#
+# Run on your local files:
+#
+#   docker run \
+#       --rm \
+#       --mount type=bind,source=$(pwd),target=/src \
+#       --user root
+#       -e HOST_UID=$(id -u) \
+#       -e HOST_GID=$(id -g) \
+#       newsboat-build-tools \
+#       make
+#
+# To save bandwidth, and speed up the build slightly, share the host's Cargo
+# cache with the container:
+#
+#   mkdir -p ~/.cargo/registry
+#   docker run \
+#       --mount type=bind,source=$HOME/.cargo/registry,target=/home/builder/.cargo/registry \
+#       ... # the rest of the options
+#
+# If you want to build on the host again, run this to remove binary files
+# compiled in the container:
+#
+#   make distclean
 
 FROM ubuntu:23.10
 
@@ -27,15 +72,16 @@ RUN apt-get update \
     && apt-get install --assume-yes --no-install-recommends \
         build-essential $cxx_package libsqlite3-dev libcurl4-openssl-dev libssl-dev \
         libxml2-dev libstfl-dev libjson-c-dev libncursesw5-dev gettext git \
-        pkg-config zlib1g-dev asciidoctor \
+        pkg-config zlib1g-dev asciidoctor gosu \
     && apt-get autoremove \
     && apt-get clean
 
 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 \
@@ -47,7 +93,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
 
@@ -65,3 +111,11 @@ ARG cxx=g++-13
 
 ENV CC=$cc
 ENV CXX=$cxx
+
+USER root
+COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
+# Cirrus doesn't run the entrypoint script so we switch directly to the target user.
+USER builder