WIP

Author: hoh

.github/workflows/build-deb-package.yml

@@ -39,6 +39,12 @@ jobs:
         with:
           toolchain: stable
 
+      - name: Build the sevctl binary
+        run: |
+          cd packaging && make sevctl-podman
+          mkdir -p ./aleph-vm/opt
+          cp -p ./target/sevctl ./aleph-vm/opt/sevctl
+
       - run: |
           cd packaging && make ${{ matrix.make_target }} && cd ..
           ls packaging/target

packaging/Makefile

@@ -18,14 +18,15 @@ debian-package-code:
 	pip3 install --target ./aleph-vm/opt/aleph-vm/ 'aleph-message==0.4.4' 'eth-account==0.10' 'sentry-sdk==1.31.0' 'qmp==1.1.0' 'superfluid==0.2.1' 'sqlalchemy[asyncio]>=2.0' 'aiosqlite==0.19.0' 'alembic==1.13.1' 'aiohttp_cors==0.7.0' 'pyroute2==0.7.12'
 	python3 -m compileall ./aleph-vm/opt/aleph-vm/
 
-debian-package-resources: firecracker-bins vmlinux download-ipfs-kubo target/sevctl
+debian-package-resources: firecracker-bins vmlinux download-ipfs-kubo  # target/sevctl
 	rm -fr ./aleph-vm/opt/firecracker
 	mkdir -p ./aleph-vm/opt/firecracker
 	cp -pr ./target/vmlinux.bin ./aleph-vm/opt/firecracker/
 	cp -pr ./target/firecracker ./aleph-vm/opt/firecracker/
 	cp -pr ./target/jailer ./aleph-vm/opt/firecracker/
 	cp -pr ./target/kubo/kubo ./aleph-vm/opt/kubo
-	cp -pr ./target/sevctl ./aleph-vm/opt/sevctl
+	# build sevctl in a separate step since building it requires a recent Rust compiler
+	# cp -pr ./target/sevctl ./aleph-vm/opt/sevctl
 
 firecracker-bins: target-dir build-dir
 	mkdir -p ./build/firecracker-release
@@ -55,10 +56,14 @@ target/sevctl:
 sevctl-podman:
 	# Build sevctl inside an OCI Image with an upstream version of Rust.
 	# sevctl requires a version of Rust more recent than the one available in Debian stable.
-	podman build -t sevctl-builder-debian-12 -f ./debian-12-sevctl.dockerfile .
-	podman run --rm -v $(PWD)/target:/target sevctl-builder-debian-12
-	# Test the binary
-	./target/sevctl -V
+	cd .. && podman build -t localhost/aleph-vm-packaging-debian-12:latest -f ./packaging/debian-12.dockerfile .
+	mkdir -p ./target
+	podman run --rm -ti \
+		-w /opt/packaging \
+		-v ./target:/opt/packaging/target \
+		localhost/aleph-vm-packaging-debian-12:latest \
+		make target/sevctl
+	file target/sevctl
 
 version:
 	python3 ./version_from_git.py --inplace deb aleph-vm/DEBIAN/control

packaging/debian-11.dockerfile

@@ -1,12 +1,11 @@
-FROM rust:bullseye
+FROM rust:1.79.0-bullseye
 
 RUN apt-get update && apt-get -y upgrade && apt-get install -y \
     make \
     git \
     curl \
     sudo \
     python3-pip \
-    cargo \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt

packaging/debian-12.dockerfile

@@ -1,4 +1,4 @@
-FROM rust:bookworm
+FROM rust:1.79.0-bookworm
 
 RUN apt-get update && apt-get -y upgrade && apt-get install -y \
     make \