From 2523ec7e578dcfd326fecb09251796738be0e114 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Tue, 28 Sep 2021 11:23:02 +0200 Subject: [PATCH] updates --- docker/build-nightly-bootstrap/Makefile | 9 ------- .../build-nightly-bootstrap/fedora/Dockerfile | 26 ------------------- docker/nightly/Makefile | 11 ++++++++ .../debian/Dockerfile | 14 ++++++---- .../debian/Makefile | 0 docker/nightly/fedora/Dockerfile | 17 ++++++++++++ .../fedora/Makefile | 0 .../mint/Dockerfile | 15 +++++++---- .../mint/Makefile | 0 .../ubuntu/Dockerfile | 8 ++++-- .../ubuntu/Makefile | 0 docker/nightly/version | 1 + 12 files changed, 54 insertions(+), 47 deletions(-) delete mode 100644 docker/build-nightly-bootstrap/Makefile delete mode 100644 docker/build-nightly-bootstrap/fedora/Dockerfile create mode 100644 docker/nightly/Makefile rename docker/{build-nightly-bootstrap => nightly}/debian/Dockerfile (54%) rename docker/{build-nightly-bootstrap => nightly}/debian/Makefile (100%) create mode 100644 docker/nightly/fedora/Dockerfile rename docker/{build-nightly-bootstrap => nightly}/fedora/Makefile (100%) rename docker/{build-nightly-bootstrap => nightly}/mint/Dockerfile (56%) rename docker/{build-nightly-bootstrap => nightly}/mint/Makefile (100%) rename docker/{build-nightly-bootstrap => nightly}/ubuntu/Dockerfile (60%) rename docker/{build-nightly-bootstrap => nightly}/ubuntu/Makefile (100%) create mode 100644 docker/nightly/version diff --git a/docker/build-nightly-bootstrap/Makefile b/docker/build-nightly-bootstrap/Makefile deleted file mode 100644 index d9687c5..0000000 --- a/docker/build-nightly-bootstrap/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -all : - make -C debian - make -C fedora - make -C ubuntu - make -C mint - -clean : - sudo docker image prune --force - diff --git a/docker/build-nightly-bootstrap/fedora/Dockerfile b/docker/build-nightly-bootstrap/fedora/Dockerfile deleted file mode 100644 index b42a5c5..0000000 --- a/docker/build-nightly-bootstrap/fedora/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -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-devel mercurial -# Build 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 - - - - -# -## packages required to build and run apiserver. -#RUN dnf -y install g++ gcc make automake autoconf libtool libcurl-devel -#COPY apiserver-0.1.1.tar.gz / -#WORKDIR / -#RUN tar xvf apiserver-0.1.1.tar.gz -#WORKDIR apiserver-0.1.1 -#RUN zsh ./configure --prefix=/usr --disable-dependency-tracking -#RUN ["make", "install"] -#RUN ["make", "dist"] -# diff --git a/docker/nightly/Makefile b/docker/nightly/Makefile new file mode 100644 index 0000000..7918532 --- /dev/null +++ b/docker/nightly/Makefile @@ -0,0 +1,11 @@ +all : + cp version debian/version && cp version fedora/version && cp version ubuntu/version && cp version mint/version + make -C debian + make -C fedora + make -C ubuntu + make -C mint + +clean : + sudo docker image prune --force + + diff --git a/docker/build-nightly-bootstrap/debian/Dockerfile b/docker/nightly/debian/Dockerfile similarity index 54% rename from docker/build-nightly-bootstrap/debian/Dockerfile rename to docker/nightly/debian/Dockerfile index 5defa38..d735403 100644 --- a/docker/build-nightly-bootstrap/debian/Dockerfile +++ b/docker/nightly/debian/Dockerfile @@ -1,9 +1,13 @@ FROM debian MAINTAINER Bert van der Weerd RUN apt-get -y update && apt-get -y upgrade -# Install build dependencies.. -run apt-get -y install wget python3 python3-dev mercurial -# Build 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 +# 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 + +# Build it.. +copy version / diff --git a/docker/build-nightly-bootstrap/debian/Makefile b/docker/nightly/debian/Makefile similarity index 100% rename from docker/build-nightly-bootstrap/debian/Makefile rename to docker/nightly/debian/Makefile diff --git a/docker/nightly/fedora/Dockerfile b/docker/nightly/fedora/Dockerfile new file mode 100644 index 0000000..8b02475 --- /dev/null +++ b/docker/nightly/fedora/Dockerfile @@ -0,0 +1,17 @@ +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 + +# Build it.. +copy version / diff --git a/docker/build-nightly-bootstrap/fedora/Makefile b/docker/nightly/fedora/Makefile similarity index 100% rename from docker/build-nightly-bootstrap/fedora/Makefile rename to docker/nightly/fedora/Makefile diff --git a/docker/build-nightly-bootstrap/mint/Dockerfile b/docker/nightly/mint/Dockerfile similarity index 56% rename from docker/build-nightly-bootstrap/mint/Dockerfile rename to docker/nightly/mint/Dockerfile index 785f504..10c778c 100644 --- a/docker/build-nightly-bootstrap/mint/Dockerfile +++ b/docker/nightly/mint/Dockerfile @@ -1,9 +1,14 @@ FROM linuxmintd/mint20.2-amd64 MAINTAINER Bert van der Weerd RUN apt-get -y update && apt-get -y upgrade -# Install build dependencies.. -run apt-get -y install wget python3 python3-dev mercurial -# Build 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 + +# 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 + +# Build it.. +copy version / diff --git a/docker/build-nightly-bootstrap/mint/Makefile b/docker/nightly/mint/Makefile similarity index 100% rename from docker/build-nightly-bootstrap/mint/Makefile rename to docker/nightly/mint/Makefile diff --git a/docker/build-nightly-bootstrap/ubuntu/Dockerfile b/docker/nightly/ubuntu/Dockerfile similarity index 60% rename from docker/build-nightly-bootstrap/ubuntu/Dockerfile rename to docker/nightly/ubuntu/Dockerfile index 5909a5a..5ed1229 100644 --- a/docker/build-nightly-bootstrap/ubuntu/Dockerfile +++ b/docker/nightly/ubuntu/Dockerfile @@ -1,9 +1,13 @@ FROM ubuntu MAINTAINER Bert van der Weerd RUN apt-get -y update && apt-get -y upgrade + # Install build dependencies.. -run apt-get -y install wget python3 python3-dev mercurial +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 echo '***' python3 bootstrap.py --no-interactive --application-choice=browser +run python3 bootstrap.py --no-interactive --application-choice=browser +# Build it.. +copy version / diff --git a/docker/build-nightly-bootstrap/ubuntu/Makefile b/docker/nightly/ubuntu/Makefile similarity index 100% rename from docker/build-nightly-bootstrap/ubuntu/Makefile rename to docker/nightly/ubuntu/Makefile diff --git a/docker/nightly/version b/docker/nightly/version new file mode 100644 index 0000000..34de4d2 --- /dev/null +++ b/docker/nightly/version @@ -0,0 +1 @@ +92.0.1