diff --git a/Makefile b/Makefile index 3f6b807..38d35a5 100644 --- a/Makefile +++ b/Makefile @@ -47,11 +47,15 @@ $(tarball) : docker : docker-debian11 docker-mint20 docker-ubuntu20 docker-ubuntu21 docker-fedora34 docker-fedora35 -build : debian11 mint20 ubuntu20 ubuntu21 fedora34 fedora35 +build : clean debian11 clean mint20 clean ubuntu20 clean ubuntu21 clean fedora34 clean fedora35 clean push : - docker push librewolf/bsys5-image-debian11 librewolf/bsys5-image-mint20 librewolf/bsys5-image-ubuntu20 librewolf/bsys5-image-ubuntu21 librewolf/bsys5-image-fedora34 librewolf/bsys5-image-fedora35 - + docker push librewolf/bsys5-image-debian11 + docker push librewolf/bsys5-image-mint20 + docker push librewolf/bsys5-image-ubuntu20 + docker push librewolf/bsys5-image-ubuntu21 + docker push librewolf/bsys5-image-fedora34 + docker push librewolf/bsys5-image-fedora35 work : $(tarball) mkdir work diff --git a/linux.Dockerfile b/linux.Dockerfile index 8187115..a091cad 100644 --- a/linux.Dockerfile +++ b/linux.Dockerfile @@ -3,10 +3,16 @@ FROM $distro ENV version 96.0.3 ENV source_release 3 -# we use this wasi version.. + +# we use this wasi version ENV wasi_fullversion 14.0 ENV wasi_mainversion 14 +# these ones seem to be needed by ubuntu +ENV DEBIAN_FRONTEND=noninteractive +ENV TZ=Europe/Amsterdam + + # dependencies needed to run ./mach bootstrap RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget ; true) RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget ; true)