From 5a93220522cbda9b7c8a523062a3669f06623b8f Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 2 Oct 2021 08:13:59 +0200 Subject: [PATCH] fixes to docker --- docker/Makefile | 18 ++++++++++-------- docker/librewolf/debian/deb/Dockerfile | 4 ++-- docker/librewolf/debian/deb/Makefile | 11 ++++++++++- docker/librewolf/fedora/rpm/Dockerfile | 4 +++- docker/librewolf/fedora/rpm/Makefile | 11 ++++++++++- docker/librewolf/mint/deb/Dockerfile | 2 ++ docker/librewolf/mint/deb/Makefile | 11 ++++++++++- docker/librewolf/ubuntu/deb/Dockerfile | 2 ++ docker/librewolf/ubuntu/deb/Makefile | 13 +++++++++++-- 9 files changed, 60 insertions(+), 16 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index e6841cc..def368d 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,11 +1,9 @@ +all : lw + help : @echo "Use: make all clean lw prune mozilla full" @echo " make debian fedora mint ubuntu" -all : lw -# for working with the original mozilla source: -# all : mozilla - clean : rm -f librewolf/version release/version @@ -28,20 +26,24 @@ mozilla : prune : sudo docker system prune --all --force -full : prune lw mozilla +madman : prune lw mozilla debian : make -C buildenv/debian + cp version librewolf/debian make -C librewolf/debian fedora : - mace -C buildenv/fedora + make -C buildenv/fedora + cp version librewolf/fedora make -C librewolf/fedora mint : - mace -C buildenv/mint + make -C buildenv/mint + cp version librewolf/mint make -C librewolf/mint ubuntu : - mace -C buildenv/ubuntu + make -C buildenv/ubuntu + cp version librewolf/ubuntu make -C librewolf/ubuntu diff --git a/docker/librewolf/debian/deb/Dockerfile b/docker/librewolf/debian/deb/Dockerfile index 3470001..e7f56ab 100644 --- a/docker/librewolf/debian/deb/Dockerfile +++ b/docker/librewolf/debian/deb/Dockerfile @@ -1,4 +1,4 @@ from librewolf/release-debian -workdir /windows - run ./build.py --version $(cat /version) lw_artifacts +run mkdir /artifacts +run cp librewolf-$(cat /version).en-US.deb.zip /artifacts diff --git a/docker/librewolf/debian/deb/Makefile b/docker/librewolf/debian/deb/Makefile index ed2509c..2ecbcb6 100644 --- a/docker/librewolf/debian/deb/Makefile +++ b/docker/librewolf/debian/deb/Makefile @@ -1,8 +1,17 @@ docker_stage = deb-debian -all : +all : cache + +cache : sudo docker build -t librewolf/$(docker_stage) . + make get_zip no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . + make get_zip +get_zip : + sudo docker create --name extract0 librewolf/$(docker_stage) + sudo rm -rf artifacts + sudo docker cp extract0:/artifacts . + sudo docker rm extract0 diff --git a/docker/librewolf/fedora/rpm/Dockerfile b/docker/librewolf/fedora/rpm/Dockerfile index 2ccc503..e7f56ab 100644 --- a/docker/librewolf/fedora/rpm/Dockerfile +++ b/docker/librewolf/fedora/rpm/Dockerfile @@ -1,2 +1,4 @@ -from librewolf/release-fedora +from librewolf/release-debian run ./build.py --version $(cat /version) lw_artifacts +run mkdir /artifacts +run cp librewolf-$(cat /version).en-US.deb.zip /artifacts diff --git a/docker/librewolf/fedora/rpm/Makefile b/docker/librewolf/fedora/rpm/Makefile index 6995276..aa863ff 100644 --- a/docker/librewolf/fedora/rpm/Makefile +++ b/docker/librewolf/fedora/rpm/Makefile @@ -1,8 +1,17 @@ docker_stage = rpm-fedora -all : +all : cache + +cache : sudo docker build -t librewolf/$(docker_stage) . + make get_zip no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . + make get_zip +get_zip : + sudo docker create --name extract1 librewolf/$(docker_stage) + sudo rm -rf artifacts + sudo docker cp extract1:/artifacts . + sudo docker rm extract1 diff --git a/docker/librewolf/mint/deb/Dockerfile b/docker/librewolf/mint/deb/Dockerfile index 59b85de..8309d2c 100644 --- a/docker/librewolf/mint/deb/Dockerfile +++ b/docker/librewolf/mint/deb/Dockerfile @@ -1,2 +1,4 @@ from librewolf/release-mint run ./build.py --version $(cat /version) lw_artifacts +run mkdir /artifacts +run cp librewolf-$(cat /version).en-US.deb.zip /artifacts diff --git a/docker/librewolf/mint/deb/Makefile b/docker/librewolf/mint/deb/Makefile index 6b9b73e..53dfb80 100644 --- a/docker/librewolf/mint/deb/Makefile +++ b/docker/librewolf/mint/deb/Makefile @@ -1,8 +1,17 @@ docker_stage = deb-mint -all : +all : cache + +cache : sudo docker build -t librewolf/$(docker_stage) . + make get_zip no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . + make get_zip +get_zip : + sudo docker create --name extract2 librewolf/$(docker_stage) + sudo rm -rf artifacts + sudo docker cp extract2:/artifacts . + sudo docker rm extract2 diff --git a/docker/librewolf/ubuntu/deb/Dockerfile b/docker/librewolf/ubuntu/deb/Dockerfile index 495a097..0427b48 100644 --- a/docker/librewolf/ubuntu/deb/Dockerfile +++ b/docker/librewolf/ubuntu/deb/Dockerfile @@ -1,2 +1,4 @@ from librewolf/release-ubuntu run ./build.py --version $(cat /version) lw_artifacts +run mkdir /artifacts +run cp librewolf-$(cat /version).en-US.deb.zip /artifacts diff --git a/docker/librewolf/ubuntu/deb/Makefile b/docker/librewolf/ubuntu/deb/Makefile index 6b9b73e..cc97931 100644 --- a/docker/librewolf/ubuntu/deb/Makefile +++ b/docker/librewolf/ubuntu/deb/Makefile @@ -1,8 +1,17 @@ -docker_stage = deb-mint +docker_stage = deb-ubuntu -all : +all : cache + +cache : sudo docker build -t librewolf/$(docker_stage) . + make get_zip no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . + make get_zip +get_zip : + sudo docker create --name extract3 librewolf/$(docker_stage) + sudo rm -rf artifacts + sudo docker cp extract3:/artifacts . + sudo docker rm extract3