From d94439dc72142f44adb53518cd305d7e3cd0f5ca Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 14 Dec 2022 12:10:43 +0100 Subject: [PATCH] Wed 14 Dec 2022 12:10:43 PM CET --- Makefile | 33 ++++++++++++++++++++++++++++++++- assets/Dockerfile | 20 ++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 assets/Dockerfile diff --git a/Makefile b/Makefile index d3ccf25..86c180b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ -.PHONY : help check all clean veryclean dir bootstrap fetch build package run update setup-wasi check-patchfail check-fuzz fixfuzz +docker_targets=docker-build-image docker-run-build-job docker-remove-image + +.PHONY : help check all clean veryclean dir bootstrap fetch build package run update setup-wasi check-patchfail check-fuzz fixfuzz $(docker_targets) version:=$(shell cat ./version) release:=$(shell cat ./release) @@ -41,6 +43,7 @@ help : @echo " check-fuzz - check patches for fuzz." @echo " fixfuz - fix the fuzz." @echo "" + @echo "docker:" $(docker_targets) check : python3 scripts/update-version.py @@ -127,3 +130,31 @@ check-fuzz: -sh -c "./scripts/check-patchfail.sh --fuzz=0" > patchfail-fuzz.out fixfuzz : sh -c "./scripts/fuzzfail.sh" + + + + + + +# +# docker +# + + +build_image=librewolf-build-image + +docker-build-image : + docker build -t $(build_image) - < assets/Dockerfile + +docker-run-build-job : + docker run --rm $(build_image) sh -c "git pull && make check && make fetch && make all" + +docker-remove-image : + docker rmi $(build_image) + +setup-debian : + apt-get -y install mercurial python3 python3-dev python3-pip curl wget dpkg-sig libssl-dev zstd libxml2-dev + +setup-fedora : + dnf -y install python3 curl wget zstd python3-devel python3-pip mercurial openssl-devel libxml2-devel + diff --git a/assets/Dockerfile b/assets/Dockerfile new file mode 100644 index 0000000..777ff9a --- /dev/null +++ b/assets/Dockerfile @@ -0,0 +1,20 @@ +FROM ubuntu:jammy +#FROM fedora:36 + +RUN apt-get update && apt-get -y upgrade && apt-get -y install make wget git patch +#RUN dnf -y update && dnf -y install make wget git patch + + +# dependencies needed to run ./mach bootstrap +RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget dpkg-sig ; true) +RUN ( dnf -y upgrade && dnf -y install python3 python3-devel wget rpm-build rpm-sign ; true) + + + +WORKDIR / +RUN rm -rf /source +RUN git clone https://gitlab.com/librewolf-community/browser/source.git +WORKDIR /source + +RUN make check && make setup-debian && make fetch && make bootstrap && make veryclean +#RUN make check && make setup-fedora && make fetch && make bootstrap && make veryclean