diff --git a/Dockerfile b/Dockerfile index 2b98839..f2add9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,19 @@ ARG distro FROM $distro # dependencies needed to run ./mach bootstrap -RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip ; true) -RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel ; true) +RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget ; true) +RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget ; true) + +# run ./mach bootstrap +RUN mkdir /bootstrap +WORKDIR /bootstrap +# setup wasi +RUN ( export target_wasi_location=$HOME/.mozbuild/wrlb/ && wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-14/wasi-sdk-14.0-linux.tar.gz && tar xvf wasi-sdk-14.0-linux.tar.gz && mkdir -p $target_wasi_location && rm -rf $target_wasi_location/wasi-sysroot && cp -vr wasi-sdk-14.0/share/wasi-sysroot $target_wasi_location && rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-* ) +# run the bootstrap +RUN wget -q -O librewolf-96.0.3-3.source.tar.gz "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-3.source.tar.gz?job=Build" +RUN tar xf librewolf-96.0.3-3.source.tar.gz +WORKDIR librewolf-96.0.3 +RUN (MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen) # our work happens here, on the host filesystem. WORKDIR /work diff --git a/Makefile b/Makefile index 4e3ee33..7697535 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ run-docker-image-debian11 : sudo rm -rf work mkdir work (cd work && tar xf ../$(tarball)) - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-debian11 sh -c "cd /work/librewolf-$(version) && MOZBUILD_STATE_PATH=$$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && ./mach build && ./mach package" + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-debian11 sh -c "cd /work/librewolf-$(version) && ./mach build && ./mach package"