From eb974cc05d81daa0fdf280c808167049c006f956 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Fri, 9 Aug 2024 09:18:49 +0200 Subject: [PATCH] build: prevent docker container rebuilds when changing build-linux.sh --- .docker/Dockerfile.arch | 5 +---- .docker/Dockerfile.fedora | 5 +---- .docker/Dockerfile.ubuntu | 5 +---- .docker/Dockerfile.ubuntu-2204 | 5 +---- .docker/build-linux.sh | 0 5 files changed, 4 insertions(+), 16 deletions(-) mode change 100644 => 100755 .docker/build-linux.sh diff --git a/.docker/Dockerfile.arch b/.docker/Dockerfile.arch index 9a55a764..82f75ffd 100644 --- a/.docker/Dockerfile.arch +++ b/.docker/Dockerfile.arch @@ -44,9 +44,6 @@ RUN pacman -S --noconfirm --needed \ google-glog \ flac \ utf8cpp -ARG SCRIPT=build-linux.sh -COPY $SCRIPT /usr/local/bin/run.sh -RUN chmod +x /usr/local/bin/run.sh RUN useradd -g users -u 1000 -m mhx USER mhx -ENTRYPOINT /usr/local/bin/run.sh +ENTRYPOINT /workspace/.docker/build-linux.sh diff --git a/.docker/Dockerfile.fedora b/.docker/Dockerfile.fedora index 3d1861a8..acc401fc 100644 --- a/.docker/Dockerfile.fedora +++ b/.docker/Dockerfile.fedora @@ -49,9 +49,6 @@ RUN dnf install -y \ json-devel \ range-v3-devel RUN pip install mistletoe -ARG SCRIPT=build-linux.sh -COPY $SCRIPT /usr/local/bin/run.sh -RUN chmod +x /usr/local/bin/run.sh RUN useradd -g users -u 1000 -m mhx USER mhx -ENTRYPOINT /usr/local/bin/run.sh +ENTRYPOINT /workspace/.docker/build-linux.sh diff --git a/.docker/Dockerfile.ubuntu b/.docker/Dockerfile.ubuntu index cc1618d0..dfb215ad 100644 --- a/.docker/Dockerfile.ubuntu +++ b/.docker/Dockerfile.ubuntu @@ -79,8 +79,5 @@ RUN wget -O - https://github.com/upx/upx/releases/download/v4.2.1/upx-4.2.1-$(ba # current ronn version is horribly broken RUN gem install ronn-ng # RUN useradd -g users -u 1000 -m mhx -ARG SCRIPT=build-linux.sh -COPY $SCRIPT /usr/local/bin/run.sh -RUN chmod +x /usr/local/bin/run.sh USER ubuntu -ENTRYPOINT /usr/local/bin/run.sh +ENTRYPOINT /workspace/.docker/build-linux.sh diff --git a/.docker/Dockerfile.ubuntu-2204 b/.docker/Dockerfile.ubuntu-2204 index fa06d688..a6a1bc7c 100644 --- a/.docker/Dockerfile.ubuntu-2204 +++ b/.docker/Dockerfile.ubuntu-2204 @@ -64,8 +64,5 @@ ARG ARCH # current ronn version is horribly broken RUN gem install ronn-ng RUN useradd -g users -u 1000 -m mhx -ARG SCRIPT=build-linux.sh -COPY $SCRIPT /usr/local/bin/run.sh -RUN chmod +x /usr/local/bin/run.sh USER mhx -ENTRYPOINT /usr/local/bin/run.sh +ENTRYPOINT /workspace/.docker/build-linux.sh diff --git a/.docker/build-linux.sh b/.docker/build-linux.sh old mode 100644 new mode 100755