More changes

Author: ayufan

Makefile

@@ -95,14 +95,13 @@ client: $(addsuffix -client, $(CLIENT_BUILD_ARCHS))
 # Debian Packages
 
 %-deb: %-dockerhub-pull
-	mkdir -p release
+	rm -rf tmp/proxmox-backup-server-$(TAG)-$*
 	-docker rm -f proxmox-backup-$(TAG)-$*
 	docker create --name=proxmox-backup-$(TAG)-$* $(REGISTRY):$(TAG)-$*
-	docker cp proxmox-backup-$(TAG)-$*:/src/release/. release/$*
+	docker cp proxmox-backup-$(TAG)-$*:/release/. tmp/proxmox-backup-server-$(TAG)-$*
 	-docker rm -f proxmox-backup-$(TAG)-$*
-	tar zcvf release/proxmox-backup-server-project-${version}.tgz \
-		--transform="s|^release/|proxmox-backup-server-$(VERSION)/|" \
-		release/*/*.deb release/install
+	tar zcvf release/proxmox-backup-server-$(TAG)-$*.tgz --transform="s|^tmp/||" tmp/proxmox-backup-server-$(TAG)-$*/
+	release/proxmox-backup-client-$(VERSION)-$*.tgz
 
 deb: $(addsuffix -deb, $(BUILD_ARCHS))
 

dockerfiles/Dockerfile.client

@@ -38,5 +38,5 @@ RUN ./scripts/repo.bash --keep proxmox-backup "make . ignore proxmox-backup-clie
 
 # Bundle client
 ARG VERSION
-ADD /dockerfiles/ /dockerfiles/
-RUN /dockerfiles/bundle-client.bash
+ADD /dockerfiles/scripts/ /dockerfiles/scripts/
+RUN /dockerfiles/scripts/bundle-client.bash

dockerfiles/scripts/bundle-client.bash

@@ -9,7 +9,7 @@ BINARIES=( /src/build/proxmox-backup/target/static-build/*/release/{pxar,proxmox
 mkdir -p "$DESTDIR/$NAME"
 
 cp -v ${BINARIES[@]} "$DESTDIR/$NAME"
-cp -v /dockerfiles/client/* "$DESTDIR/$NAME"
+cp -v /dockerfiles/scripts/client/* "$DESTDIR/$NAME"
 
 cd $DESTDIR
 tar zcfv "$NAME.tgz" $NAME