Update dockerfiles

Author: ayufan

dockerfiles/Dockerfile.build

@@ -49,21 +49,26 @@ RUN ./scripts/repo.bash proxmox-acme make_deb
 RUN ./scripts/repo.bash pve-xtermjs "make_deb termproxy" "make_deb xterm.js"
 RUN ./scripts/repo.bash proxmox-backup make_deb
 
-# Generate install script
-ADD /dockerfiles/scripts/install.bash /src/dockerfiles/scripts/install.bash
-RUN ./dockerfiles/scripts/install.bash --gen /src/release \
-      proxmox-backup-server > /src/release/install && \
-    chmod +x /src/release/install
+#=================================
+
+FROM ${ARCH}debian:bookworm AS deb_env
+
+# Generate release package
+COPY --from=builder /src/release/ /release/
+ADD /dockerfiles/scripts/install.bash /dockerfiles/scripts/install.bash
+RUN /dockerfiles/scripts/install.bash --gen /release/install /release proxmox-backup-server
 
 #=================================
 
 FROM ${ARCH}debian:bookworm
-COPY --from=builder /src/release/ /release/
 
-# Install all packages
+# Copy packages
+COPY --from=deb_env /release/ /release/
+
+# Install base packages
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get -y update && \
-  apt install -y runit ssmtp cron && \
+  apt install -y runit ssmtp cron &&
   /release/install
 
 # Add default configs

dockerfiles/scripts/install.bash

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 if [[ "$1" == "--gen" ]]; then
-  GEN=1
-  shift
+  GEN="$2"
+  shift 2
 fi
 
 if [[ $# -lt 2 ]]; then
-  echo "usage: $0 [--gen] <folder> [package names...]"
+  echo "usage: $0 [--gen file] <folder> [package names...]"
   exit 1
 fi
 
@@ -59,10 +59,12 @@ resolve_all_pkgs() {
 }
 
 if [[ -n "$GEN" ]]; then
-  echo "#!/bin/sh"
-  echo "cd \$(dirname \"\$0\")"
-  echo apt install -y $(resolve_all_pkgs "$@")
-else
-  set +x
-  apt install -y $(resolve_all_pkgs "$@")
+  echo "#!/bin/sh" > "$GEN"
+  echo "cd \$(dirname \"\$0\")" >> "$GEN"
+  echo apt install -y $(resolve_all_pkgs "$@") >> "$GEN"
+  chmod +x "$GEN"
+  exit 0
 fi
+
+set +x
+apt install -y $(resolve_all_pkgs "$@")