diff --git a/Makefile b/Makefile index 39e0712..53a43ef 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,9 @@ git_init : reset : $(BUILD) reset - - - - +# Building docker files.. +.phony : docker-all docker-clean +docker-all : + make -C docker all +docker-clean : + make -C docker clean diff --git a/docker/Makefile b/docker/Makefile index ca60d8e..7861941 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,11 +1,8 @@ all : + make -C buildenv make -C nightly make -C release clean : - - sudo docker image prune --force - -prune : - docker system prune --all --force + sudo docker system prune --all --force diff --git a/docker/buildenv/Makefile b/docker/buildenv/Makefile new file mode 100644 index 0000000..24b0b72 --- /dev/null +++ b/docker/buildenv/Makefile @@ -0,0 +1,5 @@ +all : + make -C debian + make -C fedora + make -C ubuntu + make -C mint diff --git a/docker/buildenv/debian/Dockerfile b/docker/buildenv/debian/Dockerfile new file mode 100644 index 0000000..1951003 --- /dev/null +++ b/docker/buildenv/debian/Dockerfile @@ -0,0 +1,13 @@ +FROM debian +MAINTAINER Bert van der Weerd +ENV DEBIAN_FRONTEND=noninteractive +ENV TZ=Europe/Amsterdam +RUN apt-get -y update && apt-get -y upgrade + +# Install build dependencies.. +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 bootstrap.py diff --git a/docker/buildenv/debian/Makefile b/docker/buildenv/debian/Makefile new file mode 100644 index 0000000..d5cb196 --- /dev/null +++ b/docker/buildenv/debian/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/buildenv-debian . diff --git a/docker/buildenv/fedora/Dockerfile b/docker/buildenv/fedora/Dockerfile new file mode 100644 index 0000000..ef7ddcc --- /dev/null +++ b/docker/buildenv/fedora/Dockerfile @@ -0,0 +1,15 @@ +FROM fedora +MAINTAINER Bert van der Weerd +RUN dnf -y update + +# locale stuff, see: https://superuser.com/questions/959380/how-do-i-install-generate-all-locales-on-fedora +RUN echo "%_install_langs C:en:en_US:en_US.UTF-8" > /etc/rpm/macros.image-language-conf +RUN dnf -y reinstall glibc-common + +# Install build dependencies.. +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 python3 bootstrap.py --no-interactive --application-choice=browser +run rm bootstrap.py diff --git a/docker/buildenv/fedora/Makefile b/docker/buildenv/fedora/Makefile new file mode 100644 index 0000000..a4e4d42 --- /dev/null +++ b/docker/buildenv/fedora/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build --no-cache --rm -t mozilla/buildenv-fedora . diff --git a/docker/buildenv/mint/Dockerfile b/docker/buildenv/mint/Dockerfile new file mode 100644 index 0000000..a6aa70a --- /dev/null +++ b/docker/buildenv/mint/Dockerfile @@ -0,0 +1,13 @@ +FROM linuxmintd/mint20.2-amd64 +MAINTAINER Bert van der Weerd +ENV DEBIAN_FRONTEND=noninteractive +ENV TZ=Europe/Amsterdam +RUN apt-get -y update && apt-get -y upgrade + +# Install build dependencies.. +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 bootstrap.py diff --git a/docker/buildenv/mint/Makefile b/docker/buildenv/mint/Makefile new file mode 100644 index 0000000..673dc8c --- /dev/null +++ b/docker/buildenv/mint/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/buildenv-mint . diff --git a/docker/buildenv/ubuntu/Dockerfile b/docker/buildenv/ubuntu/Dockerfile new file mode 100644 index 0000000..aa4c81e --- /dev/null +++ b/docker/buildenv/ubuntu/Dockerfile @@ -0,0 +1,13 @@ +FROM ubuntu +MAINTAINER Bert van der Weerd +ENV DEBIAN_FRONTEND=noninteractive +ENV TZ=Europe/Amsterdam +RUN apt-get -y update && apt-get -y upgrade + +# Install build dependencies.. +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 bootstrap.py diff --git a/docker/buildenv/ubuntu/Makefile b/docker/buildenv/ubuntu/Makefile new file mode 100644 index 0000000..08555f4 --- /dev/null +++ b/docker/buildenv/ubuntu/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/buildenv-ubuntu . diff --git a/docker/nightly/debian/Dockerfile b/docker/nightly/debian/Dockerfile index 1bb2fc1..453a3dc 100644 --- a/docker/nightly/debian/Dockerfile +++ b/docker/nightly/debian/Dockerfile @@ -1,18 +1,6 @@ -FROM debian -MAINTAINER Bert van der Weerd -RUN apt-get -y update && apt-get -y upgrade -ENV DEBIAN_FRONTEND=noninteractive -ENV TZ=Europe/Amsterdam - -# Install build dependencies.. -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 +FROM mozilla/buildenv-debian # 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 8ab13fb..3d3c09e 100644 --- a/docker/nightly/fedora/Dockerfile +++ b/docker/nightly/fedora/Dockerfile @@ -1,20 +1,6 @@ -FROM fedora -MAINTAINER Bert van der Weerd -RUN dnf -y update - -# locale stuff, see: https://superuser.com/questions/959380/how-do-i-install-generate-all-locales-on-fedora -RUN echo "%_install_langs C:en:en_US:en_US.UTF-8" > /etc/rpm/macros.image-language-conf -RUN dnf -y reinstall glibc-common - -# Install build dependencies.. -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 +FROM mozilla/buildenv-fedora # Build it.. -run rm bootstrap.py workdir mozilla-unified run ./mach build run ./mach package diff --git a/docker/nightly/mint/Dockerfile b/docker/nightly/mint/Dockerfile index a6e952f..7a7ef90 100644 --- a/docker/nightly/mint/Dockerfile +++ b/docker/nightly/mint/Dockerfile @@ -1,18 +1,6 @@ -FROM linuxmintd/mint20.2-amd64 -MAINTAINER Bert van der Weerd -RUN apt-get -y update && apt-get -y upgrade -ENV DEBIAN_FRONTEND=noninteractive -ENV TZ=Europe/Amsterdam - -# Install build dependencies.. -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 +FROM mozilla/buildenv-mint # 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 774c256..ac96bfe 100644 --- a/docker/nightly/ubuntu/Dockerfile +++ b/docker/nightly/ubuntu/Dockerfile @@ -1,18 +1,6 @@ -FROM ubuntu -MAINTAINER Bert van der Weerd -RUN apt-get -y update && apt-get -y upgrade -ENV DEBIAN_FRONTEND=noninteractive -ENV TZ=Europe/Amsterdam - -# Install build dependencies.. -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 +FROM mozilla/buildenv-ubuntu # Build it.. -run rm bootstrap.py workdir mozilla-unified run ./mach build run ./mach package diff --git a/docker/release/debian/Dockerfile b/docker/release/debian/Dockerfile index 6a60cdc..16d8973 100644 --- a/docker/release/debian/Dockerfile +++ b/docker/release/debian/Dockerfile @@ -1,16 +1,5 @@ -FROM debian -MAINTAINER Bert van der Weerd -RUN apt-get -y update && apt-get -y upgrade -ENV DEBIAN_FRONTEND=noninteractive -ENV TZ=Europe/Amsterdam - -# Install build dependencies.. -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 +FROM mozilla/buildenv-debian +RUN rm -rf mozilla-unified # Build it.. copy version / diff --git a/docker/release/fedora/Dockerfile b/docker/release/fedora/Dockerfile index 659c71d..6da1815 100644 --- a/docker/release/fedora/Dockerfile +++ b/docker/release/fedora/Dockerfile @@ -1,18 +1,5 @@ -FROM fedora -MAINTAINER Bert van der Weerd -RUN dnf -y update - -# locale stuff, see: https://superuser.com/questions/959380/how-do-i-install-generate-all-locales-on-fedora -RUN echo "%_install_langs C:en:en_US:en_US.UTF-8" > /etc/rpm/macros.image-language-conf -RUN dnf -y reinstall glibc-common - -# Install build dependencies.. -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 +FROM mozilla/buildenv-fedora +RUN rm -rf mozilla-unified # Build it.. copy version / diff --git a/docker/release/mint/Dockerfile b/docker/release/mint/Dockerfile index fcdf102..8061c86 100644 --- a/docker/release/mint/Dockerfile +++ b/docker/release/mint/Dockerfile @@ -1,16 +1,5 @@ -FROM linuxmintd/mint20.2-amd64 -MAINTAINER Bert van der Weerd -RUN apt-get -y update && apt-get -y upgrade -ENV DEBIAN_FRONTEND=noninteractive -ENV TZ=Europe/Amsterdam - -# Install build dependencies.. -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 +FROM mozilla/buildenv-mint +RUN rm -rf mozilla-unified # Build it.. copy version / diff --git a/docker/release/ubuntu/Dockerfile b/docker/release/ubuntu/Dockerfile index 7710110..ec9f895 100644 --- a/docker/release/ubuntu/Dockerfile +++ b/docker/release/ubuntu/Dockerfile @@ -1,16 +1,5 @@ -FROM ubuntu -MAINTAINER Bert van der Weerd -RUN apt-get -y update && apt-get -y upgrade -ENV DEBIAN_FRONTEND=noninteractive -ENV TZ=Europe/Amsterdam - -# Install build dependencies.. -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 +FROM mozilla/buildenv-ubuntu +RUN rm -rf mozilla-unified # Build it.. copy version /