diff --git a/README.md b/README.md index cfedbca..20e8098 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ afford to. | | Status | Docker | Doesn't need --privileged | Doesn't need /dev/kvm | Backend | | --- | --- | --- | --- | --- | --- | | **Arch Linux** | ✔️ supported | ❌ | - | ✔️ | [archlinux-repro](https://github.com/archlinux/archlinux-repro) | -| **Debian** | 🚀 experimental | ✔️ | ❌ | ✔️ | [debrebuild.pl](https://salsa.debian.org/debian/devscripts/-/blob/master/scripts/debrebuild.pl) | +| **Debian** | 🚀 experimental | ✔️ | ❌ | ✔️ | [debrebuild.py](https://github.com/fepitre/debrebuild) | | **Tails** | 🚀 experimental | ❌ | - | ❌ | [docs](https://tails.boum.org/contribute/build/) ([script](worker/rebuilder-tails.sh)) | | **Alpine** | ✨ planned | - | - | - | - | diff --git a/worker/Dockerfile.debian b/worker/Dockerfile.debian index 0baa05d..23c0fea 100644 --- a/worker/Dockerfile.debian +++ b/worker/Dockerfile.debian @@ -10,7 +10,14 @@ RUN --mount=type=cache,target=/var/cache/buildkit \ cp -v /var/cache/buildkit/debian/target/release/rebuilderd-worker / FROM debian:bullseye -RUN apt-get update && apt-get install -y libssl-dev devscripts sbuild mmdebstrap +RUN apt-get update && apt install -y libssl-dev git mmdebstrap \ + python3-apt python3-dateutil python3-requests python3-rstr python3-setuptools python3-httpx python3-tenacity \ + debian-keyring debian-archive-keyring debian-ports-archive-keyring +# this is a temporary solution +# copied from https://github.com/fepitre/package-rebuilder/blob/fc38df2f6e81ae6307e47cf515caa3e92ec8f5a4/rebuilder.Dockerfile +RUN git clone https://salsa.debian.org/python-debian-team/python-debian /opt/python-debian +RUN cd /opt/python-debian && git checkout e28d7a5729b187cfd0ec95da25030224cd10021a && python3 setup.py build install +RUN git clone --depth=1 'https://github.com/fepitre/debrebuild' /debrebuild COPY --from=0 \ /usr/src/rebuilderd/worker/rebuilder-debian.sh \ /usr/local/libexec/rebuilderd/ diff --git a/worker/rebuilder-debian.sh b/worker/rebuilder-debian.sh index c9b4f8b..7946dad 100755 --- a/worker/rebuilder-debian.sh +++ b/worker/rebuilder-debian.sh @@ -1,3 +1,4 @@ #!/bin/sh set -xe -debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=mmdebstrap -- "${1}" +# debrebuild.py needs to be run from the repo +/debrebuild/debrebuild.py --output="${REBUILDERD_OUTDIR}" --builder=mmdebstrap -- "${1}"