From 543d8c34d59097a867dd3bddecaf6aac1f965630 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Tue, 28 Sep 2021 16:43:36 +0200 Subject: [PATCH] Docker builds --- docker/Makefile | 5 +++-- docker/librewolf/debian/Makefile | 2 -- docker/librewolf/fedora/Makefile | 2 -- docker/librewolf/mint/Makefile | 2 -- docker/librewolf/ubuntu/Makefile | 2 -- docker/nightly/Makefile | 7 ------- docker/nightly/debian/Dockerfile | 4 ++++ docker/nightly/fedora/Dockerfile | 4 ++++ docker/nightly/fedora/Makefile | 2 +- docker/nightly/mint/Dockerfile | 6 ++++-- docker/nightly/ubuntu/Dockerfile | 4 ++++ docker/{librewolf => release}/Makefile | 6 ------ docker/{librewolf => release}/debian/.gitignore | 0 docker/{librewolf => release}/debian/Dockerfile | 10 ++++++++++ docker/release/debian/Makefile | 2 ++ docker/{librewolf => release}/fedora/.gitignore | 0 docker/{librewolf => release}/fedora/Dockerfile | 10 ++++++++++ docker/release/fedora/Makefile | 2 ++ docker/{librewolf => release}/mint/.gitignore | 0 docker/{librewolf => release}/mint/Dockerfile | 9 +++++++++ docker/release/mint/Makefile | 2 ++ docker/{librewolf => release}/ubuntu/.gitignore | 0 docker/{librewolf => release}/ubuntu/Dockerfile | 10 ++++++++++ docker/release/ubuntu/Makefile | 2 ++ docker/{librewolf => release}/version | 0 25 files changed, 67 insertions(+), 26 deletions(-) delete mode 100644 docker/librewolf/debian/Makefile delete mode 100644 docker/librewolf/fedora/Makefile delete mode 100644 docker/librewolf/mint/Makefile delete mode 100644 docker/librewolf/ubuntu/Makefile rename docker/{librewolf => release}/Makefile (80%) rename docker/{librewolf => release}/debian/.gitignore (100%) rename docker/{librewolf => release}/debian/Dockerfile (62%) create mode 100644 docker/release/debian/Makefile rename docker/{librewolf => release}/fedora/.gitignore (100%) rename docker/{librewolf => release}/fedora/Dockerfile (68%) create mode 100644 docker/release/fedora/Makefile rename docker/{librewolf => release}/mint/.gitignore (100%) rename docker/{librewolf => release}/mint/Dockerfile (63%) create mode 100644 docker/release/mint/Makefile rename docker/{librewolf => release}/ubuntu/.gitignore (100%) rename docker/{librewolf => release}/ubuntu/Dockerfile (62%) create mode 100644 docker/release/ubuntu/Makefile rename docker/{librewolf => release}/version (100%) diff --git a/docker/Makefile b/docker/Makefile index 10bdccb..ca60d8e 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,10 +1,11 @@ all : make -C nightly - make -C librewolf + make -C release clean : sudo docker image prune --force - +prune : + docker system prune --all --force diff --git a/docker/librewolf/debian/Makefile b/docker/librewolf/debian/Makefile deleted file mode 100644 index 58802ad..0000000 --- a/docker/librewolf/debian/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -all : - sudo docker build -t librewolf/release-debian . diff --git a/docker/librewolf/fedora/Makefile b/docker/librewolf/fedora/Makefile deleted file mode 100644 index f288ec0..0000000 --- a/docker/librewolf/fedora/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -all : - sudo docker build -t librewolf/release-fedora . diff --git a/docker/librewolf/mint/Makefile b/docker/librewolf/mint/Makefile deleted file mode 100644 index d7a853f..0000000 --- a/docker/librewolf/mint/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -all : - sudo docker build -t librewolf/release-mint . diff --git a/docker/librewolf/ubuntu/Makefile b/docker/librewolf/ubuntu/Makefile deleted file mode 100644 index 03cf88a..0000000 --- a/docker/librewolf/ubuntu/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -all : - sudo docker build -t librewolf/release-ubuntu . diff --git a/docker/nightly/Makefile b/docker/nightly/Makefile index a3182d5..24b0b72 100644 --- a/docker/nightly/Makefile +++ b/docker/nightly/Makefile @@ -1,12 +1,5 @@ all : - make -C debian make -C fedora make -C ubuntu make -C mint - -clean : - - sudo docker image prune --force - - diff --git a/docker/nightly/debian/Dockerfile b/docker/nightly/debian/Dockerfile index 7289469..1bb2fc1 100644 --- a/docker/nightly/debian/Dockerfile +++ b/docker/nightly/debian/Dockerfile @@ -12,4 +12,8 @@ run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozbo run python3 bootstrap.py --no-interactive --application-choice=browser # Build it.. +run rm bootstrap.py +workdir mozilla-unified +run ./mach build +run ./mach package diff --git a/docker/nightly/fedora/Dockerfile b/docker/nightly/fedora/Dockerfile index 38541da..8ab13fb 100644 --- a/docker/nightly/fedora/Dockerfile +++ b/docker/nightly/fedora/Dockerfile @@ -14,3 +14,7 @@ run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozbo run echo python3 bootstrap.py --no-interactive --application-choice=browser # Build it.. +run rm bootstrap.py +workdir mozilla-unified +run ./mach build +run ./mach package diff --git a/docker/nightly/fedora/Makefile b/docker/nightly/fedora/Makefile index b45f231..8587751 100644 --- a/docker/nightly/fedora/Makefile +++ b/docker/nightly/fedora/Makefile @@ -1,2 +1,2 @@ all : - sudo docker build -t mozilla/nightly-fedora . + sudo docker build --no-cache --rm -t mozilla/nightly-fedora . diff --git a/docker/nightly/mint/Dockerfile b/docker/nightly/mint/Dockerfile index b88bdae..a6e952f 100644 --- a/docker/nightly/mint/Dockerfile +++ b/docker/nightly/mint/Dockerfile @@ -12,5 +12,7 @@ run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozbo run python3 bootstrap.py --no-interactive --application-choice=browser # Build it.. - - +run rm bootstrap.py +workdir mozilla-unified +run ./mach build +run ./mach package diff --git a/docker/nightly/ubuntu/Dockerfile b/docker/nightly/ubuntu/Dockerfile index 9edcc56..774c256 100644 --- a/docker/nightly/ubuntu/Dockerfile +++ b/docker/nightly/ubuntu/Dockerfile @@ -12,3 +12,7 @@ run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozbo run python3 bootstrap.py --no-interactive --application-choice=browser # Build it.. +run rm bootstrap.py +workdir mozilla-unified +run ./mach build +run ./mach package diff --git a/docker/librewolf/Makefile b/docker/release/Makefile similarity index 80% rename from docker/librewolf/Makefile rename to docker/release/Makefile index 71d7439..fbd1e1a 100644 --- a/docker/librewolf/Makefile +++ b/docker/release/Makefile @@ -6,9 +6,3 @@ all : make -C fedora make -C ubuntu make -C mint - -clean : - - sudo docker image prune --force - - diff --git a/docker/librewolf/debian/.gitignore b/docker/release/debian/.gitignore similarity index 100% rename from docker/librewolf/debian/.gitignore rename to docker/release/debian/.gitignore diff --git a/docker/librewolf/debian/Dockerfile b/docker/release/debian/Dockerfile similarity index 62% rename from docker/librewolf/debian/Dockerfile rename to docker/release/debian/Dockerfile index 182ef49..6a60cdc 100644 --- a/docker/librewolf/debian/Dockerfile +++ b/docker/release/debian/Dockerfile @@ -10,6 +10,16 @@ run apt-get -y install wget python3 python3-pip python3-dev mercurial # Fetch mozilla nightly.. run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py run python3 bootstrap.py --no-interactive --application-choice=browser +run rm -rf mozilla-unified bootstrap.py # Build it.. copy version / + +run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz +run tar xf firefox-$(cat /version).source.tar.xz +run ln -s firefox-$(cat /version) work + +workdir work + +run ./mach build +run ./mach package diff --git a/docker/release/debian/Makefile b/docker/release/debian/Makefile new file mode 100644 index 0000000..5798103 --- /dev/null +++ b/docker/release/debian/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/release-debian . diff --git a/docker/librewolf/fedora/.gitignore b/docker/release/fedora/.gitignore similarity index 100% rename from docker/librewolf/fedora/.gitignore rename to docker/release/fedora/.gitignore diff --git a/docker/librewolf/fedora/Dockerfile b/docker/release/fedora/Dockerfile similarity index 68% rename from docker/librewolf/fedora/Dockerfile rename to docker/release/fedora/Dockerfile index 8b02475..659c71d 100644 --- a/docker/librewolf/fedora/Dockerfile +++ b/docker/release/fedora/Dockerfile @@ -12,6 +12,16 @@ run dnf -y install wget python3 python3-pip python3-devel mercurial # Fetch mozilla nightly.. run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py run echo python3 bootstrap.py --no-interactive --application-choice=browser +run rm -rf mozilla-unified bootstrap.py # Build it.. copy version / + +run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz +run tar xf firefox-$(cat /version).source.tar.xz +run ln -s firefox-$(cat /version) work + +workdir work + +run ./mach build +run ./mach package diff --git a/docker/release/fedora/Makefile b/docker/release/fedora/Makefile new file mode 100644 index 0000000..980a49a --- /dev/null +++ b/docker/release/fedora/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/release-fedora . diff --git a/docker/librewolf/mint/.gitignore b/docker/release/mint/.gitignore similarity index 100% rename from docker/librewolf/mint/.gitignore rename to docker/release/mint/.gitignore diff --git a/docker/librewolf/mint/Dockerfile b/docker/release/mint/Dockerfile similarity index 63% rename from docker/librewolf/mint/Dockerfile rename to docker/release/mint/Dockerfile index 53dc071..fcdf102 100644 --- a/docker/librewolf/mint/Dockerfile +++ b/docker/release/mint/Dockerfile @@ -10,7 +10,16 @@ run apt-get -y install wget python3 python3-pip python3-dev mercurial # Fetch mozilla nightly.. run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py run python3 bootstrap.py --no-interactive --application-choice=browser +run rm -rf mozilla-unified bootstrap.py # Build it.. copy version / +run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz +run tar xf firefox-$(cat /version).source.tar.xz +run ln -s firefox-$(cat /version) work + +workdir work + +run ./mach build +run ./mach package diff --git a/docker/release/mint/Makefile b/docker/release/mint/Makefile new file mode 100644 index 0000000..6ddcc0e --- /dev/null +++ b/docker/release/mint/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/release-mint . diff --git a/docker/librewolf/ubuntu/.gitignore b/docker/release/ubuntu/.gitignore similarity index 100% rename from docker/librewolf/ubuntu/.gitignore rename to docker/release/ubuntu/.gitignore diff --git a/docker/librewolf/ubuntu/Dockerfile b/docker/release/ubuntu/Dockerfile similarity index 62% rename from docker/librewolf/ubuntu/Dockerfile rename to docker/release/ubuntu/Dockerfile index 2710f50..7710110 100644 --- a/docker/librewolf/ubuntu/Dockerfile +++ b/docker/release/ubuntu/Dockerfile @@ -10,6 +10,16 @@ run apt-get -y install wget python3 python3-pip python3-dev mercurial # Build mozilla nightly.. run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py run python3 bootstrap.py --no-interactive --application-choice=browser +run rm -rf mozilla-unified bootstrap.py # Build it.. copy version / + +run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz +run tar xf firefox-$(cat /version).source.tar.xz +run ln -s firefox-$(cat /version) work + +workdir work + +run ./mach build +run ./mach package diff --git a/docker/release/ubuntu/Makefile b/docker/release/ubuntu/Makefile new file mode 100644 index 0000000..9111716 --- /dev/null +++ b/docker/release/ubuntu/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/release-ubuntu . diff --git a/docker/librewolf/version b/docker/release/version similarity index 100% rename from docker/librewolf/version rename to docker/release/version