diff --git a/docker/Makefile b/docker/Makefile new file mode 100644 index 0000000..10bdccb --- /dev/null +++ b/docker/Makefile @@ -0,0 +1,10 @@ +all : + + make -C nightly + make -C librewolf + +clean : + + sudo docker image prune --force + + diff --git a/docker/librewolf/Makefile b/docker/librewolf/Makefile index 7918532..71d7439 100644 --- a/docker/librewolf/Makefile +++ b/docker/librewolf/Makefile @@ -1,11 +1,14 @@ 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/librewolf/debian/Dockerfile b/docker/librewolf/debian/Dockerfile index d735403..182ef49 100644 --- a/docker/librewolf/debian/Dockerfile +++ b/docker/librewolf/debian/Dockerfile @@ -1,6 +1,8 @@ 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 diff --git a/docker/librewolf/mint/Dockerfile b/docker/librewolf/mint/Dockerfile index 10c778c..53dc071 100644 --- a/docker/librewolf/mint/Dockerfile +++ b/docker/librewolf/mint/Dockerfile @@ -1,6 +1,8 @@ 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 diff --git a/docker/librewolf/ubuntu/Dockerfile b/docker/librewolf/ubuntu/Dockerfile index 5ed1229..2710f50 100644 --- a/docker/librewolf/ubuntu/Dockerfile +++ b/docker/librewolf/ubuntu/Dockerfile @@ -1,6 +1,8 @@ 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 diff --git a/docker/nightly/Makefile b/docker/nightly/Makefile index 7918532..a3182d5 100644 --- a/docker/nightly/Makefile +++ b/docker/nightly/Makefile @@ -1,11 +1,12 @@ 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/nightly/debian/Dockerfile b/docker/nightly/debian/Dockerfile index bb62f9a..7289469 100644 --- a/docker/nightly/debian/Dockerfile +++ b/docker/nightly/debian/Dockerfile @@ -1,6 +1,8 @@ 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 diff --git a/docker/nightly/mint/Dockerfile b/docker/nightly/mint/Dockerfile index 622947b..b88bdae 100644 --- a/docker/nightly/mint/Dockerfile +++ b/docker/nightly/mint/Dockerfile @@ -1,6 +1,8 @@ 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 diff --git a/docker/nightly/ubuntu/Dockerfile b/docker/nightly/ubuntu/Dockerfile index 9aeef25..9edcc56 100644 --- a/docker/nightly/ubuntu/Dockerfile +++ b/docker/nightly/ubuntu/Dockerfile @@ -1,6 +1,8 @@ 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 diff --git a/docs/MR_howto.md b/md/MR_howto.md similarity index 100% rename from docs/MR_howto.md rename to md/MR_howto.md diff --git a/docs/about_blurp.md b/md/about_blurp.md similarity index 100% rename from docs/about_blurp.md rename to md/about_blurp.md diff --git a/docs/addons-new.md b/md/addons-new.md similarity index 100% rename from docs/addons-new.md rename to md/addons-new.md diff --git a/docs/dl_locations.md b/md/dl_locations.md similarity index 100% rename from docs/dl_locations.md rename to md/dl_locations.md diff --git a/docs/drm_blurp.md b/md/drm_blurp.md similarity index 100% rename from docs/drm_blurp.md rename to md/drm_blurp.md diff --git a/docs/website_overhaul.md b/md/website_overhaul.md similarity index 100% rename from docs/website_overhaul.md rename to md/website_overhaul.md diff --git a/docs/website_structure.md b/md/website_structure.md similarity index 100% rename from docs/website_structure.md rename to md/website_structure.md diff --git a/settings b/settings index b17a1ed..75b9e80 160000 --- a/settings +++ b/settings @@ -1 +1 @@ -Subproject commit b17a1ed657e22ac61b4399699223d36724b842e7 +Subproject commit 75b9e803d3f0f03c53b3adac3262ac30298b6782