From 1af2db3cc88655a4a7ea1142019d2eaf59725ce6 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Tue, 28 Sep 2021 10:41:30 +0200 Subject: [PATCH] Updating dockerfiles --- docker/build-nightly-bootstrap/Makefile | 9 ++++++ .../build-nightly-bootstrap/debian/Dockerfile | 22 +++++--------- .../debian/Dockerfile~ | 17 ----------- .../build-nightly-bootstrap/debian/Makefile~ | 3 -- .../build-nightly-bootstrap/fedora/Dockerfile | 30 ++++++++++++------- .../fedora/Dockerfile~ | 17 ----------- .../build-nightly-bootstrap/fedora/Makefile~ | 3 -- .../build-nightly-bootstrap/mint/Dockerfile | 9 ++++++ docker/build-nightly-bootstrap/mint/Makefile | 2 ++ .../build-nightly-bootstrap/ubuntu/Dockerfile | 9 ++++++ .../build-nightly-bootstrap/ubuntu/Makefile | 2 ++ 11 files changed, 58 insertions(+), 65 deletions(-) create mode 100644 docker/build-nightly-bootstrap/Makefile delete mode 100644 docker/build-nightly-bootstrap/debian/Dockerfile~ delete mode 100644 docker/build-nightly-bootstrap/debian/Makefile~ delete mode 100644 docker/build-nightly-bootstrap/fedora/Dockerfile~ delete mode 100644 docker/build-nightly-bootstrap/fedora/Makefile~ create mode 100644 docker/build-nightly-bootstrap/mint/Dockerfile create mode 100644 docker/build-nightly-bootstrap/mint/Makefile create mode 100644 docker/build-nightly-bootstrap/ubuntu/Dockerfile create mode 100644 docker/build-nightly-bootstrap/ubuntu/Makefile diff --git a/docker/build-nightly-bootstrap/Makefile b/docker/build-nightly-bootstrap/Makefile new file mode 100644 index 0000000..d9687c5 --- /dev/null +++ b/docker/build-nightly-bootstrap/Makefile @@ -0,0 +1,9 @@ +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/debian/Dockerfile b/docker/build-nightly-bootstrap/debian/Dockerfile index e7dfc30..5defa38 100644 --- a/docker/build-nightly-bootstrap/debian/Dockerfile +++ b/docker/build-nightly-bootstrap/debian/Dockerfile @@ -1,17 +1,9 @@ FROM debian MAINTAINER Bert van der Weerd -RUN dnf -y update -RUN dnf -y install bash -# 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 -# 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"] -EXPOSE 8000 -ENTRYPOINT ["/usr/bin/apiserver"] +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 + diff --git a/docker/build-nightly-bootstrap/debian/Dockerfile~ b/docker/build-nightly-bootstrap/debian/Dockerfile~ deleted file mode 100644 index abea50d..0000000 --- a/docker/build-nightly-bootstrap/debian/Dockerfile~ +++ /dev/null @@ -1,17 +0,0 @@ -FROM fedora -MAINTAINER Bert van der Weerd -RUN dnf -y update -RUN dnf -y install bash -# 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 -# 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"] -EXPOSE 8000 -ENTRYPOINT ["/usr/bin/apiserver"] diff --git a/docker/build-nightly-bootstrap/debian/Makefile~ b/docker/build-nightly-bootstrap/debian/Makefile~ deleted file mode 100644 index 47a7fa9..0000000 --- a/docker/build-nightly-bootstrap/debian/Makefile~ +++ /dev/null @@ -1,3 +0,0 @@ -all : -# sudo docker build -t stanzabird/apiserver . - sudo docker build -t mozilla/build-nightly-bootstrap . diff --git a/docker/build-nightly-bootstrap/fedora/Dockerfile b/docker/build-nightly-bootstrap/fedora/Dockerfile index 2e5ffb8..b42a5c5 100644 --- a/docker/build-nightly-bootstrap/fedora/Dockerfile +++ b/docker/build-nightly-bootstrap/fedora/Dockerfile @@ -1,16 +1,26 @@ FROM fedora MAINTAINER Bert van der Weerd RUN dnf -y update -RUN dnf -y install bash zsh # 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 -# 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"] +# 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/build-nightly-bootstrap/fedora/Dockerfile~ b/docker/build-nightly-bootstrap/fedora/Dockerfile~ deleted file mode 100644 index abea50d..0000000 --- a/docker/build-nightly-bootstrap/fedora/Dockerfile~ +++ /dev/null @@ -1,17 +0,0 @@ -FROM fedora -MAINTAINER Bert van der Weerd -RUN dnf -y update -RUN dnf -y install bash -# 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 -# 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"] -EXPOSE 8000 -ENTRYPOINT ["/usr/bin/apiserver"] diff --git a/docker/build-nightly-bootstrap/fedora/Makefile~ b/docker/build-nightly-bootstrap/fedora/Makefile~ deleted file mode 100644 index 47a7fa9..0000000 --- a/docker/build-nightly-bootstrap/fedora/Makefile~ +++ /dev/null @@ -1,3 +0,0 @@ -all : -# sudo docker build -t stanzabird/apiserver . - sudo docker build -t mozilla/build-nightly-bootstrap . diff --git a/docker/build-nightly-bootstrap/mint/Dockerfile b/docker/build-nightly-bootstrap/mint/Dockerfile new file mode 100644 index 0000000..785f504 --- /dev/null +++ b/docker/build-nightly-bootstrap/mint/Dockerfile @@ -0,0 +1,9 @@ +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 + diff --git a/docker/build-nightly-bootstrap/mint/Makefile b/docker/build-nightly-bootstrap/mint/Makefile new file mode 100644 index 0000000..fda9dec --- /dev/null +++ b/docker/build-nightly-bootstrap/mint/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/build-nightly-bootstrap-mint . diff --git a/docker/build-nightly-bootstrap/ubuntu/Dockerfile b/docker/build-nightly-bootstrap/ubuntu/Dockerfile new file mode 100644 index 0000000..5909a5a --- /dev/null +++ b/docker/build-nightly-bootstrap/ubuntu/Dockerfile @@ -0,0 +1,9 @@ +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 +# 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 + diff --git a/docker/build-nightly-bootstrap/ubuntu/Makefile b/docker/build-nightly-bootstrap/ubuntu/Makefile new file mode 100644 index 0000000..bda4c92 --- /dev/null +++ b/docker/build-nightly-bootstrap/ubuntu/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/build-nightly-bootstrap-ubuntu .