diff --git a/Dockerfile b/Dockerfile index 00f7adb..2b98839 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,9 @@ ARG distro - FROM $distro # dependencies needed to run ./mach bootstrap - -RUN ( apt -y update && apt -y upgrade && apt -y install mercurial python3 python3-dev python3-pip ; true) -RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel && python3 -m pip install --user mercurial ; true) +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) # our work happens here, on the host filesystem. WORKDIR /work diff --git a/Makefile b/Makefile index 13e2120..a88dc59 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ version:=$(shell cat version) release:=$(shell cat release) source_release:=$(shell cat source_release) +tarball=librewolf-$(version)-$(source_release).source.tar.gz help : @echo "Use: make [help] [all] [clean] [veryclean] [fetch] [prune]" @@ -15,14 +16,13 @@ all : clean : sudo rm -rf work -veryclean : - +veryclean : clean + rm -f $(tarball) prune : docker system prune --all --force -# fetching the source -tarball=librewolf-$(version)-$(source_release).source.tar.gz fetch : $(tarball) + $(tarball) : wget -O $(tarball) "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/$(tarball)?job=Build" @@ -32,12 +32,12 @@ $(tarball) : tag=debian11 tag_distro=debian:bullseye make-docker-image-debian11 : - script -e -c 'time docker build --no-cache --build-arg distro=$(tag_distro) -t librewolf/bsys5-image-$(tag) - < Dockerfile' + docker build --no-cache --build-arg distro=$(tag_distro) -t librewolf/bsys5-image-$(tag) - < Dockerfile run-docker-image-debian11 : sudo rm -rf work mkdir work (cd work && tar xf ../$(tarball)) - script -e -c 'time docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(tag) 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-$(tag) 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"