Store git clone separately to rest scripts

Author: ayufan

Makefile

@@ -109,14 +109,14 @@ deb: $(addsuffix -deb, $(BUILD_ARCHS))
 
 tmp-env:
 	mkdir -p "tmp/$(VERSION)"
-	cd "tmp/$(VERSION)" && ../../versions/$(VERSION)/clone.bash
+	cd "tmp/$(VERSION)" && ../../versions/$(VERSION)/git/clone.bash
 	cd "tmp/$(VERSION)" && ../../scripts/apply-patches.bash ../../versions/$(VERSION)/server/*.patch
 	cd "tmp/$(VERSION)" && ../../scripts/strip-cargo.bash
 	cd "tmp/$(VERSION)" && ../../scripts/resolve-dependencies.bash
 
 tmp-env-client:
 	mkdir -p "tmp/$(VERSION)-client"
-	cd "tmp/$(VERSION)-client" && ../../versions/$(VERSION)/clone.bash
+	cd "tmp/$(VERSION)-client" && ../../versions/$(VERSION)/git/clone.bash
 	cd "tmp/$(VERSION)-client" && ../../scripts/apply-patches.bash ../../versions/$(VERSION)/server/*.patch ./../versions/$(VERSION)/client*/*.patch
 	cd "tmp/$(VERSION)-client" && ../../scripts/strip-cargo.bash
 	cd "tmp/$(VERSION)-client" && ../../scripts/resolve-dependencies.bash
@@ -152,7 +152,7 @@ endif
 
 	rm -rf "versions/v$(NEW_VERSION).tmp"
 	cp -rv "versions/$(VERSION)" "versions/v$(NEW_VERSION).tmp"
-	"versions/v$(NEW_VERSION).tmp/clone.bash" show-sha $(firstword $(NEW_SHA) $(NEW_VERSION)) > "versions/v$(NEW_VERSION).tmp/versions.tmp"
+	"versions/v$(NEW_VERSION).tmp/git/clone.bash" show-sha $(firstword $(NEW_SHA) $(NEW_VERSION)) > "versions/v$(NEW_VERSION).tmp/versions.tmp"
 	mv "versions/v$(NEW_VERSION).tmp/versions.tmp" "versions/v$(NEW_VERSION).tmp/versions"
 	mv "versions/v$(NEW_VERSION).tmp" "versions/v$(NEW_VERSION)"
 

versions/v3.4.1/Dockerfile

@@ -28,12 +28,13 @@ FROM toolchain as builder
 
 # Clone all sources
 ARG VERSION=master
-ADD /versions/${VERSION}/ /patches/
+ADD /versions/${VERSION}/git /patches/
 RUN /patches/clone.bash
 
 # Apply all patches
 ADD /scripts/ /scripts/
-RUN /scripts/apply-patches.bash /patches/server/*.patch
+ADD /versions/${VERSION}/server /patches/
+RUN /scripts/apply-patches.bash /patches/*.patch
 RUN /scripts/strip-cargo.bash
 RUN /scripts/resolve-dependencies.bash
 
@@ -47,8 +48,8 @@ RUN cd perlmod/perlmod-bin && dpkg-buildpackage -us -uc -b && dpkg -i ../perlmod
 
 # A pve-common required deps
 RUN apt-get -y build-dep $PWD/proxmox-perl-rs/pve-rs
+RUN make -C proxmox-perl-rs/common/pkg deb install
 RUN make -C proxmox-perl-rs/pve-rs deb
-RUN make -C proxmox-perl-rs/common/pkg deb
 RUN dpkg -i proxmox-perl-rs/common/pkg/*.deb proxmox-perl-rs/pve-rs/*.deb
 RUN apt-get -y build-dep $PWD/pve-common
 RUN make -C pve-common dinstall || apt-get -f -y install && make -C pve-common dinstall

versions/v3.4.1/Dockerfile.client

@@ -20,7 +20,7 @@ RUN git config --global user.email "[email protected]" && \
 
 # Clone all sources
 ARG VERSION=master
-ADD /versions/${VERSION}/ /patches/
+ADD /versions/${VERSION}/git /patches/git
 RUN /patches/clone.bash
 
 # Install valid rust toolchain
@@ -35,7 +35,8 @@ RUN \
 
 # Apply all patches
 ADD /scripts/ /scripts/
-RUN /scripts/apply-patches.bash /patches/server/*.patch /patches/client/*.patch /patches/client-${DOCKER_ARCH}/*.patch
+ADD /versions/${VERSION}/server /patches/
+RUN /scripts/apply-patches.bash /patches/*.patch
 RUN /scripts/strip-cargo.bash
 RUN /scripts/experimental-cargo.bash
 RUN /scripts/resolve-dependencies.bash