diff --git a/Makefile b/Makefile index d3ff0b4..91781d2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora37 fedora37 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind windows +.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora37 fedora37 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind windows docker-windows windows-submodules-update version:=$(shell cat version) release:=$(shell cat release) @@ -19,7 +19,7 @@ help : @echo " [docker-macos-x86_64], [docker-macos-aarch64]" @echo " [docker-tumbleweed]" @echo " [docker-dind]" - @echo " [docker-windows]" + @echo " [docker-windows] [windows-submodules-update]" @echo "" @echo "build targets:" @echo " [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]" @@ -220,6 +220,9 @@ docker-windows : windows : ${MAKE} -f assets/windows.mk build +windows-submodules-update : + git submodule update --recursive --remote + # # Docker in Docker (for GitLab CI) # diff --git a/assets/windows.Dockerfile b/assets/windows.Dockerfile deleted file mode 100644 index ec7c251..0000000 --- a/assets/windows.Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM ubuntu:latest -RUN apt-get -y update && apt-get -y upgrade && apt-get -y install bash git wget build-essential zip -RUN dpkg --add-architecture i386 && apt-get -y update && apt-get -y install wine32 - -RUN tmpdir=$(mktemp -d) && \ - cd $tmpdir && \ - git clone https://gitlab.com/librewolf-community/browser/windows.git && \ - cd windows/linux && \ - make setup-debian && \ - make fetch && \ - make bootstrap && \ - cd /root && \ - rm -rf $tmpdir - -WORKDIR /work -VOLUME ["/work"] diff --git a/submodules/windows b/submodules/windows index 89efcf0..5fd44e2 160000 --- a/submodules/windows +++ b/submodules/windows @@ -1 +1 @@ -Subproject commit 89efcf05acc64a36ad8d58ab10eb4a251d84c83a +Subproject commit 5fd44e22af0d80ad19f69dba65ba304e63e4a0f5