Organize changes (make and in scripts) folder

Author: ayufan

.github/workflows/build_test.yaml

@@ -49,7 +49,7 @@ jobs:
     # Push Artifacts to GitHub
     - uses: actions/upload-artifact@v4
       with:
-        name: artifact-${{ matrix.docker_arch }}-${{ env.TAG }}
+        name: server-${{ matrix.docker_arch }}
         path: release/
 
     # Push to DockerHub
@@ -84,7 +84,7 @@ jobs:
     # Push Artifacts to GitHub
     - uses: actions/upload-artifact@v4
       with:
-        name: artifact-${{ matrix.docker_arch }}-${{ env.TAG }}
+        name: client-${{ matrix.docker_arch }}
         path: release/
 
   manifest:

PROCESS.md

@@ -11,7 +11,7 @@ scripts/update-version.bash v3.2.7 cb3d41e838dec0e1002aaf5ee4c0e6cd28284c74
 make dev-shell
 
 # And then
-scripts/steps.bash
+scripts/make-all.bash
 
 # You can then try to compile image
 make dev-docker

dockerfiles/Dockerfile.build

@@ -32,22 +32,22 @@ RUN git config --system user.email "[email protected]" && \
 
 FROM toolchain as builder
 
-ADD /scripts /src/scripts
+ADD /scripts/build /src/scripts/build
 ADD /repos /src/repos
 
-RUN ./scripts/repo.bash pve-eslint make_dinstall
-RUN ./scripts/repo.bash proxmox-biome make_dinstall
-RUN ./scripts/repo.bash proxmox-widget-toolkit make_dinstall
-RUN ./scripts/repo.bash perlmod "dpkg_build perlmod-bin" "dpkg_install"
-RUN ./scripts/repo.bash proxmox-perl-rs "make_deb common/pkg" "make_deb pve-rs" dpkg_install
-RUN ./scripts/repo.bash pve-common make_dinstall
-RUN ./scripts/repo.bash extjs make_deb
-RUN ./scripts/repo.bash proxmox-i18n make_deb
-RUN ./scripts/repo.bash proxmox-mini-journalreader make_deb
-RUN ./scripts/repo.bash libjs-qrcodejs make_deb
-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
+RUN ./scripts/build/make.bash pve-eslint make_dinstall
+RUN ./scripts/build/make.bash proxmox-biome make_dinstall
+RUN ./scripts/build/make.bash proxmox-widget-toolkit make_dinstall
+RUN ./scripts/build/make.bash perlmod "dpkg_build perlmod-bin" "dpkg_install"
+RUN ./scripts/build/make.bash proxmox-perl-rs "make_deb common/pkg" "make_deb pve-rs" dpkg_install
+RUN ./scripts/build/make.bash pve-common make_dinstall
+RUN ./scripts/build/make.bash extjs make_deb
+RUN ./scripts/build/make.bash proxmox-i18n make_deb
+RUN ./scripts/build/make.bash proxmox-mini-journalreader make_deb
+RUN ./scripts/build/make.bash libjs-qrcodejs make_deb
+RUN ./scripts/build/make.bash proxmox-acme make_deb
+RUN ./scripts/build/make.bash pve-xtermjs "make_deb termproxy" "make_deb xterm.js"
+RUN ./scripts/build/make.bash proxmox-backup make_deb
 
 #=================================
 
@@ -58,9 +58,9 @@ COPY --from=builder /src/release/ /release/
 
 # Bundle server
 ARG VERSION
-ADD /dockerfiles/scripts/ /dockerfiles/scripts/
-RUN /dockerfiles/scripts/install.bash --gen /release/install /release proxmox-backup-server
-RUN /dockerfiles/scripts/bundle-server.bash
+ADD /scripts/release /src/scripts/release
+RUN /src/scripts/release/apt-install.bash --gen /release/install /release proxmox-backup-server
+RUN /src/scripts/release/bundle-tgz.bash /proxmox-backup-server-${VERSION}-${DOCKER_ARCH:-dev}.tgz /release/.
 
 #=================================
 

dockerfiles/Dockerfile.client

@@ -30,13 +30,17 @@ RUN \
   fi
 
 # Apply all patches
-ADD /scripts /src/scripts
+ADD /scripts/build /src/scripts/build
 ADD /repos /src/repos
 
 # Build
-RUN ./scripts/repo.bash --keep proxmox-backup "make . ignore proxmox-backup-client-static BUILD_MODE=release COMPILEDIR=target/static/release CARGO_STATIC_CONFIG="
+RUN ./scripts/build/make.bash --keep proxmox-backup "make . ignore proxmox-backup-client-static BUILD_MODE=release COMPILEDIR=target/static/release CARGO_STATIC_CONFIG="
 
 # Bundle client
 ARG VERSION
-ADD /dockerfiles/scripts/ /dockerfiles/scripts/
-RUN /dockerfiles/scripts/bundle-client.bash
+ADD /dockerfiles/client/ /dockerfiles/client/
+ADD /scripts/release /src/scripts/release
+RUN /src/scripts/release/bundle-tgz.bash /proxmox-backup-client-${VERSION}-${DOCKER_ARCH:-dev}.tgz \
+  /dockerfiles/client/. \
+  /src/build/proxmox-backup/target/static-build/*/release/pxar \
+  /src/build/proxmox-backup/target/static-build/*/release/proxmox-backup-client