Add v3.4.1

This updates release process, and used dockerfiles.

Author: ayufan

.dockerignore

@@ -1,4 +1,5 @@
 tmp/
+build/
 release/
-**/Dockerfile
-**/Dockerfile.client
+dockerfiles/Dockerfile*
+.env.mk

.gitignore

@@ -1,5 +1,6 @@
 docker-compose.override.yml
-tmp/
 proxmox-backup-client*.tgz
 /.env.mk
+/tmp/
+/build/
 /release/

Makefile

@@ -2,10 +2,7 @@ BUILD_ARCHS = amd64 arm64v8
 CLIENT_BUILD_ARCHS = amd64 arm64v8
 REGISTRY ?= ayufan/proxmox-backup-server
 SHELL = /usr/bin/env bash
-
-ifeq (,$(VERSION))
-VERSION := $(shell ls versions | grep -E -v '.(tmp|debug)' | sort -V | tail -n 1)
-endif
+include repos/version.mk
 
 ifeq (,$(TAG))
 TAG := $(VERSION)
@@ -40,7 +37,7 @@ dev-%:
 		--build-arg ARCH=$(addsuffix /,$(DOCKER_ARCH)) \
 		--build-arg TAG=$(TAG) \
 		--build-arg VERSION=$(VERSION) \
-		-f versions/$(VERSION)/Dockerfile \
+		-f dockerfiles/Dockerfile \
 		.
 
 docker-build: $(addsuffix -docker-build, $(BUILD_ARCHS))
@@ -86,7 +83,7 @@ dockerhub-latest-release: $(addsuffix -dockerhub-latest-release, $(BUILD_ARCHS))
 		--build-arg DOCKER_ARCH=$(DOCKER_ARCH) \
 		--build-arg TAG=$(TAG) \
 		--build-arg VERSION=$(VERSION) \
-		-f versions/$(VERSION)/Dockerfile.client \
+		-f dockerfiles/Dockerfile.client \
 		.
 
 	mkdir -p release/$(TAG)
@@ -108,18 +105,14 @@ deb: $(addsuffix -deb, $(BUILD_ARCHS))
 # Development Helpers
 
 tmp-env:
-	mkdir -p "tmp/$(VERSION)"
-	cd "tmp/$(VERSION)" && ../../versions/$(VERSION)/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" && ../../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
+	mkdir -p build
+	cd build && ../../scripts/git-clone.bash ../../repos/versions
+	cd build && ../../scripts/apply-patches.bash ../../repos/patches/
+	cd build && ../../scripts/strip-cargo.bash
+	cd build && ../../scripts/resolve-dependencies.bash
+
+tmp-env-client: tmp-env
+	cd build && ../../scripts/apply-patches.bash ../../repos/patches-client*/
 
 tmp-docker-shell:
 	docker build \
@@ -128,11 +121,11 @@ tmp-docker-shell:
 		--build-arg TAG=$(TAG) \
 		--build-arg VERSION=$(VERSION) \
 		--target toolchain \
-		-f versions/$(VERSION)/Dockerfile \
+		-f dockerfiles/Dockerfile \
 		.
 	docker run --name=tmp-docker-shell --net=host --rm -it \
 		-v "$(CURDIR):$(CURDIR)" \
-		-w "$(CURDIR)/tmp/$(VERSION)" \
+		-w "$(CURDIR)/build" \
 		tmp-docker-shell
 
 dev-run: dev-docker-build
@@ -142,19 +135,7 @@ dev-run: dev-docker-build
 dev-shell: dev-docker-build
 	TAG=$(TAG)-dev docker-compose run --rm pbs bash
 
-# Version management
-
-fork-version:
-ifndef NEW_VERSION
-	@echo "Missing 'make fork-version NEW_VERSION=...'"
-	@exit 1
-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"
-	mv "versions/v$(NEW_VERSION).tmp/versions.tmp" "versions/v$(NEW_VERSION).tmp/versions"
-	mv "versions/v$(NEW_VERSION).tmp" "versions/v$(NEW_VERSION)"
+# Release Helpers
 
 release: dockerhub client deb
 

PROCESS.md

@@ -3,55 +3,29 @@
 ## My own release procedure
 
 ```bash
-# Fork the build
-make fork-version NEW_VERSION=3.2.7 NEW_SHA=cb3d41e838dec0e1002aaf5ee4c0e6cd28284c74
+# Update repos to latest version
+# Find the sha from the https://git.proxmox.com/?p=proxmox-backup.git;a=summary
+scripts/update-version.bash v3.2.7 cb3d41e838dec0e1002aaf5ee4c0e6cd28284c74
 
 # Try to naively apply patches
 # Fix patches until it succeeds
 make tmp-env
 make tmp-env-client
+make tmp-docker-shell
 
 # Try to naively compile first
 cd tmp/v3.2.7/proxmox-backup
 cargo build
 
 # Try to run dev build first
 make dev-run
+make dev-shell
 
-# Try to compile first locally
+# Compile and push
 make amd64-docker-build
 make amd64-client
-
-# Create release package
 make github-pre-release
-
-# Mark the current version as latest
 make github-latest-release
 ```
 
-## Build on your own
-
-Refer to [PROCESS.md](PROCESS.md).
-
-```bash
-make dev-build
-```
-
-It builds on any platform, which can be: `amd64`, `arm32v7`, `arm64v8`,
-etc. Wait a around 1-3h to compile.
-
-Then you can push to your registry:
-
-```bash
-make dev-push
-```
-
-Or run locally:
-
-```bash
-make dev-shell
-make dev-run
-```
-
-You might as well pull the `*.deb` from within the image
-and install on Debian Bookworm.
+Replace `amd64` with `arm32v7` (unlikely to work) and `arm64v8`.

dockerfiles/Dockerfile

@@ -0,0 +1,104 @@
+ARG ARCH=
+FROM ${ARCH}debian:bookworm AS toolchain
+
+RUN apt-get -y update && \
+  apt-get -y install \
+    build-essential git-core \
+    lintian pkg-config quilt patch cargo \
+    nodejs node-colors node-commander \
+    libudev-dev libapt-pkg-dev \
+    libacl1-dev libpam0g-dev libfuse3-dev \
+    libsystemd-dev uuid-dev libssl-dev \
+    libclang-dev libjson-perl libcurl4-openssl-dev \
+    dh-exec dh-nodejs wget
+
+ENV RUSTUP_TOOLCHAIN=stable
+RUN wget https://static.rust-lang.org/rustup/rustup-init.sh && \
+  chmod +x rustup-init.sh && \
+  ./rustup-init.sh -y --default-toolchain "$RUSTUP_TOOLCHAIN"
+
+WORKDIR /src
+
+RUN for tool in /root/.cargo/bin/*; do ln -vsf $tool /usr/bin/; done
+RUN /usr/bin/rustc --version
+RUN git config --global user.email "[email protected]" && \
+  git config --global user.name "Docker Compile"
+
+FROM toolchain as builder
+
+# Clone all sources
+ADD /scripts/ /scripts/
+ADD /repos/versions /repos/
+RUN /scripts/git-clone.bash /repos/versions
+
+# Apply all patches
+ADD /repos/patches/ /repos/patches/
+RUN /scripts/apply-patches.bash /repos/patches/
+RUN /scripts/strip-cargo.bash
+RUN /scripts/resolve-dependencies.bash
+
+# A first required dep
+RUN apt-get -y build-dep $PWD/pve-eslint
+RUN make -C pve-eslint dinstall
+
+# A proxmox-perl-rs required deps
+RUN apt-get -y build-dep $PWD/perlmod/perlmod $PWD/perlmod/perlmod-bin $PWD/perlmod/perlmod-macro
+RUN cd perlmod/perlmod-bin && dpkg-buildpackage -us -uc -b && dpkg -i ../perlmod-bin*.deb
+
+# 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 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
+
+# Install dev dependencies of widget toolkit
+RUN apt-get -y build-dep $PWD/proxmox-widget-toolkit
+RUN cd proxmox-widget-toolkit/ && make deb && dpkg -i proxmox-widget-toolkit-dev*.deb
+
+# Deps for all rest
+RUN apt-get -y build-dep $PWD/proxmox-acme
+RUN apt-get -y build-dep $PWD/proxmox-backup
+RUN apt-get -y build-dep $PWD/proxmox-mini-journalreader
+RUN apt-get -y build-dep $PWD/extjs
+RUN apt-get -y build-dep $PWD/proxmox-i18n
+RUN apt-get -y build-dep $PWD/pve-xtermjs/termproxy
+RUN apt-get -y build-dep $PWD/pve-xtermjs/xterm.js
+RUN apt-get -y build-dep $PWD/libjs-qrcodejs
+
+# Compile ALL
+RUN make -C proxmox-backup deb
+RUN make -C extjs deb
+RUN make -C proxmox-i18n deb
+RUN make -C pve-xtermjs/termproxy deb
+RUN make -C pve-xtermjs/xterm.js deb
+RUN make -C proxmox-mini-journalreader deb
+RUN make -C libjs-qrcodejs deb
+RUN make -C proxmox-acme deb
+
+# Copy all debian packages
+RUN mkdir -p /deb && \
+  find /src/ -name '*.deb' -exec cp -av {} /deb/ \;
+
+#=================================
+
+FROM ${ARCH}debian:bookworm
+COPY --from=builder /deb/ /deb/
+RUN mkdir -p /deb/static && \
+  mv /deb/proxmox-backup-client-static*.deb /deb/static/
+
+# Install all packages
+RUN export DEBIAN_FRONTEND=noninteractive && \
+  apt-get -y update && \
+  apt install -y runit ssmtp cron /deb/*.deb
+
+# Add default configs
+ADD /dockerfiles/pbs/ /etc/proxmox-backup-default/
+
+VOLUME /etc/proxmox-backup
+VOLUME /var/log/proxmox-backup
+VOLUME /var/lib/proxmox-backup
+
+ADD /dockerfiles/runit/ /runit/
+CMD ["runsvdir", "/runit"]

dockerfiles/Dockerfile.client

@@ -0,0 +1,46 @@
+ARG DOCKER_ARCH
+FROM ${DOCKER_ARCH}/debian:bookworm AS builder
+
+RUN apt-get -y update && \
+  apt-get -y install \
+    build-essential git-core \
+    lintian pkg-config quilt patch cargo \
+    nodejs node-colors node-commander \
+    libudev-dev libapt-pkg-dev \
+    libacl1-dev libpam0g-dev libfuse3-dev \
+    libsystemd-dev uuid-dev libssl-dev \
+    libclang-dev libjson-perl libcurl4-openssl-dev \
+    dh-exec wget
+
+WORKDIR /src
+
+RUN /usr/bin/rustc --version
+RUN git config --global user.email "[email protected]" && \
+  git config --global user.name "Docker Compile"
+
+# Clone all sources
+ADD /scripts/ /scripts/
+ADD /repos/versions /repos/
+RUN /scripts/git-clone.bash /repos/versions
+
+# Install valid rust toolchain
+ARG DOCKER_ARCH
+RUN \
+  if [ "${DOCKER_ARCH}" != "arm32v7" ]; then \
+    wget https://static.rust-lang.org/rustup/rustup-init.sh && \
+    chmod +x rustup-init.sh && \
+    ./rustup-init.sh -y --default-toolchain nightly && \
+    for tool in /root/.cargo/bin/*; do ln -vsf $tool /usr/bin/; done; \
+  fi
+
+# Apply all patches
+ADD /repos/patches/ /repos/patches/
+RUN /scripts/apply-patches.bash /repos/patches/
+RUN /scripts/strip-cargo.bash
+RUN /scripts/resolve-dependencies.bash
+
+# Build
+RUN make -C proxmox-backup proxmox-backup-client-static BUILD_MODE=release COMPILEDIR=target/static/release
+
+# Bundle client
+RUN /scripts/bundle-client.bash