diff --git a/linux/Makefile b/linux/Makefile index 8fbd8e8..eb98aab 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,4 +1,4 @@ -.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean docker-build docker-run docker-clean docker-prune +.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean docker-build docker-run docker-clean docker-prune docker-shell version:=$(shell cat version) release:=$(shell cat release) @@ -27,6 +27,7 @@ help : @echo "" @echo " docker-build - Run 'docker build' for" $(docker_image_name) "image." @echo " docker-run - Run LW build using 'docker run' on" $(docker_image_name) "image." + @echo " docker-shell - Run shell in" $(docker_image_name) "image, to debug why docker-run fails." @echo " docker-clean - Remove" $(docker_image_name) "docker image." @echo " docker-prune - Delete ALL docker data: images, containers, networks, etc." @echo "" @@ -109,6 +110,8 @@ docker-build : docker build -t $(docker_image_name) - < assets/Dockerfile docker-run : docker run --rm $(docker_image_name) sh -c "make fetch && make build" +docker-shell : + docker run -it --rm $(docker_image_name) /bin/bash -i docker-clean : docker rmi $(docker_image_name) docker-prune : diff --git a/linux/assets/Dockerfile b/linux/assets/Dockerfile index 53284b2..4914a24 100644 --- a/linux/assets/Dockerfile +++ b/linux/assets/Dockerfile @@ -1,8 +1,8 @@ FROM ubuntu:jammy #FROM fedora:36 -RUN apt-get -y update && apt-get -y upgrade && apt-get -y install make wget git patch -#RUN dnf -y update && dnf -y install make wget git patch +RUN apt-get -y update && apt-get -y upgrade && apt-get -y install make wget git patch bash vim mc screen +#RUN dnf -y update && dnf -y install make wget git patch bash vim mc screen WORKDIR / RUN git clone https://gitlab.com/librewolf-community/browser/windows.git diff --git a/winbuild/version b/winbuild/version index ef2f5d2..6071472 100644 --- a/winbuild/version +++ b/winbuild/version @@ -1 +1 @@ -105.0.2 +105.0.3