Simplified build #2213

uniget-org · Dec 30, 2023 · 63b7b8b · 63b7b8b
1 parent 84dd124
commit 63b7b8b
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/tools/inotify-tools/Dockerfile.template b/tools/inotify-tools/Dockerfile.template
@@ -1,6 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-FROM ubuntu:22.04 AS build
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -21,16 +25,7 @@ ARG version
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}" https://github.com/inotify-tools/inotify-tools .
 ./autogen.sh
-./configure --prefix=/opt/inotify-tools --enable-static-binary --enable-fanotify
+./configure --prefix="${prefix}${target}" --enable-static-binary --enable-fanotify
 make LDFLAGS=--static
 make install
-EOF
-
-FROM nicholasdille/ubuntu:22.04 AS prepare
-COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
-    /etc/profile.d/ \
-    /etc/profile.d/
-SHELL [ "bash", "-clo", "errexit" ]
-ARG name
-ARG version
-COPY --from=build /opt/inotify-tools/ ${prefix}/
+EOF