From 643e08734da3f1e3123933519eb3e73479709aaf Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sun, 5 Feb 2023 12:18:46 +0100
Subject: [PATCH 01/21] adding windocker stuff from bsys6 on this branch

---
 .gitlab-ci.yml            |  7 +++++++
 Makefile                  |  9 +++++++++
 assets/windows.Dockerfile | 10 ++++++++++
 assets/windows.mk         | 27 +++++++++++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 assets/windows.Dockerfile
 create mode 100644 assets/windows.mk

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 488c0a5..edf94d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ Build Docker Images:
   when: manual
   only:
     - master
+    - windocker
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   # Needed because we aren't using our custom runners here
   services:
@@ -27,6 +28,7 @@ Build Docker Images:
           - fedora36
           - macos-x86_64
           - macos-aarch64
+	  - windows
           - dind
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
@@ -49,6 +51,7 @@ Build:
           - fedora36
           - macos-x86_64
           - macos-aarch64
+	  - windows
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags:
     - autoscale
@@ -68,6 +71,10 @@ Build:
       - librewolf-*.rpm.sha256sum
       - librewolf-*.dmg
       - librewolf-*.dmg.sha256sum
+      - librewolf-*-setup.exe
+      - librewolf-*-setup.exe.sha256sum
+      - librewolf-*-portable.zip
+      - librewolf-*-portable.zip.sha256sum
     reports:
       dotenv: variables.env
 
diff --git a/Makefile b/Makefile
index 65bb7da..ab87398 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ help :
 	@echo "  [docker-macos-x86_64], [docker-macos-aarch64]"
 	@echo "  [docker-tumbleweed]"
 	@echo "  [docker-dind]"
+	@echo "  [docker-windows]"
 	@echo ""
 	@echo "build targets:" 
 	@echo "  [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
@@ -26,6 +27,7 @@ help :
 	@echo "  [fedora37], [fedora36]"
 	@echo "  [macos-x64_64], [macos-aarch64]"
 	@echo "  [tumbleweed]"
+	@echo "  [windows]"
 	@echo "  [tarball]"
 	@echo ""
 
@@ -70,6 +72,8 @@ build :
 	${MAKE} clean
 	${MAKE} macos-aarch64
 	${MAKE} clean
+	${MAKE} windows
+	${MAKE} clean
 
 push :
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11
@@ -210,6 +214,11 @@ docker-macos-aarch64 :
 macos-aarch64 :
 	${MAKE} -f assets/macos.mk arch=aarch64 build
 
+## windows
+docker-windows :
+	${MAKE} -f assets/windows.mk docker
+windows :
+	${MAKE} -f assets/windows.mk build
 
 #
 # Docker in Docker (for GitLab CI)
diff --git a/assets/windows.Dockerfile b/assets/windows.Dockerfile
new file mode 100644
index 0000000..c1565a0
--- /dev/null
+++ b/assets/windows.Dockerfile
@@ -0,0 +1,10 @@
+FROM ubuntu:latest
+RUN apt-get -y update && apt-get -y upgrade && apt-get -y install bash git wget build-essential zip
+
+WORKDIR /root
+RUN git clone https://gitlab.com/librewolf-community/browser/windows.git
+WORKDIR /root/windows/linux
+
+RUN make setup-debian
+RUN make fetch
+RUN make bootstrap
diff --git a/assets/windows.mk b/assets/windows.mk
new file mode 100644
index 0000000..d0f3d17
--- /dev/null
+++ b/assets/windows.mk
@@ -0,0 +1,27 @@
+# windows.mk - build windows docker image and do build phase
+
+.PHONY : docker build
+
+version:=$(shell cat version)
+release:=$(shell cat release)
+source_release:=$(shell cat source_release)
+full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
+
+outfile-exe=librewolf-$(full_version).en-US.win64-setup.exe
+outfile-zip=librewolf-$(full_version).en-US.win64-portable.zip
+outfiles=$(outfile-exe) $(outfile-zip)
+
+distro=windows
+image=registry.gitlab.com/librewolf-community/browser/bsys5/$(distro):latest
+
+docker :
+	docker build -t $(image) - < assets/windows.Dockerfile
+
+build :
+	pwd
+	make all
+	cp -v $(outfiles) /
+	( cd / && sha256sum $(outfile-exe) > $(outfile-exe).sha256sum )
+	cat /$(outfile-exe).sha256sum
+	( cd / && sha256sum $(outfile-zip) > $(outfile-zip).sha256sum )
+	cat /$(outfile-zip).sha256sum

From 0e2d87916882ebd3c1dd08a8b9ff22d4d5693a59 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sun, 5 Feb 2023 12:20:03 +0100
Subject: [PATCH 02/21] Sun Feb  5 12:20:03 PM CET 2023

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index edf94d7..c90f9be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ Build Docker Images:
           - fedora36
           - macos-x86_64
           - macos-aarch64
-	  - windows
+          - windows
           - dind
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
@@ -51,7 +51,7 @@ Build:
           - fedora36
           - macos-x86_64
           - macos-aarch64
-	  - windows
+          - windows
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags:
     - autoscale

From dadf10b618994cbf1d6378f89790ecd46f6e2176 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sun, 5 Feb 2023 12:21:31 +0100
Subject: [PATCH 03/21] Sun Feb  5 12:21:31 PM CET 2023

---
 .gitlab-ci.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c90f9be..6854055 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,17 +19,17 @@ Build Docker Images:
   parallel:
     matrix:
       - DISTRO:
-          - debian11
-          - ubuntu20
-          - ubuntu22
-          - mint20
-          - mint21
-          - fedora37
-          - fedora36
-          - macos-x86_64
-          - macos-aarch64
+#          - debian11
+#          - ubuntu20
+#          - ubuntu22
+#          - mint20
+#          - mint21
+#          - fedora37
+#          - fedora36
+#          - macos-x86_64
+#          - macos-aarch64
+#          - dind
           - windows
-          - dind
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
     - make docker-$DISTRO
@@ -42,15 +42,15 @@ Build:
   parallel:
     matrix:
       - DISTRO:
-          - debian11
-          - ubuntu20
-          - ubuntu22
-          - mint20
-          - mint21
-          - fedora37
-          - fedora36
-          - macos-x86_64
-          - macos-aarch64
+#          - debian11
+#          - ubuntu20
+#          - ubuntu22
+#          - mint20
+#          - mint21
+#          - fedora37
+#          - fedora36
+#          - macos-x86_64
+#          - macos-aarch64
           - windows
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags:

From c6c9928cccb75a1a1e0be5cf81baea4cd52fe725 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sun, 5 Feb 2023 12:35:31 +0100
Subject: [PATCH 04/21] Sun Feb  5 12:35:31 PM CET 2023

---
 assets/windows.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/windows.mk b/assets/windows.mk
index d0f3d17..8165b69 100644
--- a/assets/windows.mk
+++ b/assets/windows.mk
@@ -19,6 +19,8 @@ docker :
 
 build :
 	pwd
+	(cd /root/windows && git pull)
+	make fetch
 	make all
 	cp -v $(outfiles) /
 	( cd / && sha256sum $(outfile-exe) > $(outfile-exe).sha256sum )

From 902e758ed1ee951f6f657affa7505ff8106f1808 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sun, 5 Feb 2023 13:01:07 +0100
Subject: [PATCH 05/21] Sun Feb  5 01:01:07 PM CET 2023

---
 assets/windows.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/assets/windows.mk b/assets/windows.mk
index 8165b69..9f71ca3 100644
--- a/assets/windows.mk
+++ b/assets/windows.mk
@@ -1,6 +1,7 @@
-# windows.mk - build windows docker image and do build phase
+# windows.mk - this one is quite a bit different from the others,
+# but we can fix that later.
 
-.PHONY : docker build
+.PHONY : docker build do-build
 
 version:=$(shell cat version)
 release:=$(shell cat release)
@@ -18,6 +19,9 @@ docker :
 	docker build -t $(image) - < assets/windows.Dockerfile
 
 build :
+	${MAKE} -C /root/windows/linux do-build
+
+do-build :
 	pwd
 	(cd /root/windows && git pull)
 	make fetch

From 77a3f04e29a88cd6ee863ec3acdda0b398193de2 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 7 Feb 2023 12:01:21 +0100
Subject: [PATCH 06/21] not using the dind image

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1b281a..c3261f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ Build:
 #          - macos-x86_64
 #          - macos-aarch64
           - windows
-  image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
+  image: registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO
   tags:
     - autoscale
   except:

From 3dd22413c1b2c733b21b89379f77983319c011d8 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 7 Feb 2023 12:11:46 +0100
Subject: [PATCH 07/21] fix

---
 assets/windows.mk | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/assets/windows.mk b/assets/windows.mk
index 9f71ca3..c244815 100644
--- a/assets/windows.mk
+++ b/assets/windows.mk
@@ -1,7 +1,7 @@
 # windows.mk - this one is quite a bit different from the others,
 # but we can fix that later.
 
-.PHONY : docker build do-build
+.PHONY : docker build
 
 version:=$(shell cat version)
 release:=$(shell cat release)
@@ -19,11 +19,8 @@ docker :
 	docker build -t $(image) - < assets/windows.Dockerfile
 
 build :
-	${MAKE} -C /root/windows/linux do-build
-
-do-build :
 	pwd
-	(cd /root/windows && git pull)
+	ls -a
 	make fetch
 	make all
 	cp -v $(outfiles) /

From 76992abd6731034f7a94bb8c347a1696cde167e3 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 7 Feb 2023 12:23:49 +0100
Subject: [PATCH 08/21] fix2

---
 assets/windows.mk | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/assets/windows.mk b/assets/windows.mk
index c244815..ee6b249 100644
--- a/assets/windows.mk
+++ b/assets/windows.mk
@@ -1,7 +1,7 @@
 # windows.mk - this one is quite a bit different from the others,
 # but we can fix that later.
 
-.PHONY : docker build
+.PHONY : docker build do-build
 
 version:=$(shell cat version)
 release:=$(shell cat release)
@@ -16,15 +16,22 @@ distro=windows
 image=registry.gitlab.com/librewolf-community/browser/bsys5/$(distro):latest
 
 docker :
+
 	docker build -t $(image) - < assets/windows.Dockerfile
 
 build :
+
 	pwd
-	ls -a
-	make fetch
-	make all
-	cp -v $(outfiles) /
-	( cd / && sha256sum $(outfile-exe) > $(outfile-exe).sha256sum )
-	cat /$(outfile-exe).sha256sum
-	( cd / && sha256sum $(outfile-zip) > $(outfile-zip).sha256sum )
+	git clone https://gitlab.com/librewolf-community/browser/windows.git
+	${MAKE} -C windows/linux do-build
+	sha256sum $(outfile-exe) > $(outfile-exe).sha256sum
+	cat $(outfile-exe).sha256sum
+	sha256sum $(outfile-zip) > $(outfile-zip).sha256sum
 	cat /$(outfile-zip).sha256sum
+
+do-build :
+
+	pwd
+	${MAKE} fetch
+	${MAKE} all
+	cp -v $(outfiles) ../..

From 376d4cfa8ccde3bf1ed629de972f00818ba72a8c Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 7 Feb 2023 12:34:19 +0100
Subject: [PATCH 09/21] Tue Feb  7 12:34:19 PM CET 2023

---
 assets/windows.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/windows.mk b/assets/windows.mk
index ee6b249..587cc5a 100644
--- a/assets/windows.mk
+++ b/assets/windows.mk
@@ -23,7 +23,7 @@ build :
 
 	pwd
 	git clone https://gitlab.com/librewolf-community/browser/windows.git
-	${MAKE} -C windows/linux do-build
+	${MAKE} -C windows/linux -f windows/linux/Makefile do-build
 	sha256sum $(outfile-exe) > $(outfile-exe).sha256sum
 	cat $(outfile-exe).sha256sum
 	sha256sum $(outfile-zip) > $(outfile-zip).sha256sum

From efcc11ba56e1d63638c4f806ed54359b5fc8478b Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 7 Feb 2023 12:43:47 +0100
Subject: [PATCH 10/21] Tue Feb  7 12:43:47 PM CET 2023

---
 assets/windows.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/assets/windows.mk b/assets/windows.mk
index 587cc5a..dd0e9f7 100644
--- a/assets/windows.mk
+++ b/assets/windows.mk
@@ -22,8 +22,9 @@ docker :
 build :
 
 	pwd
+	rm -rf windows
 	git clone https://gitlab.com/librewolf-community/browser/windows.git
-	${MAKE} -C windows/linux -f windows/linux/Makefile do-build
+	${MAKE} -C windows/linux do-build
 	sha256sum $(outfile-exe) > $(outfile-exe).sha256sum
 	cat $(outfile-exe).sha256sum
 	sha256sum $(outfile-zip) > $(outfile-zip).sha256sum
@@ -32,6 +33,6 @@ build :
 do-build :
 
 	pwd
-	${MAKE} fetch
-	${MAKE} all
+	${MAKE} -f Makefile fetch
+	${MAKE} -f Makefile all
 	cp -v $(outfiles) ../..

From c62860eb6fd1c7a53635352b487e50312a69221b Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 7 Feb 2023 12:51:56 +0100
Subject: [PATCH 11/21] Tue Feb  7 12:51:56 PM CET 2023

---
 assets/windows.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/assets/windows.mk b/assets/windows.mk
index dd0e9f7..f0f6ad4 100644
--- a/assets/windows.mk
+++ b/assets/windows.mk
@@ -1,7 +1,7 @@
 # windows.mk - this one is quite a bit different from the others,
 # but we can fix that later.
 
-.PHONY : docker build do-build
+.PHONY : docker build
 
 version:=$(shell cat version)
 release:=$(shell cat release)
@@ -24,15 +24,15 @@ build :
 	pwd
 	rm -rf windows
 	git clone https://gitlab.com/librewolf-community/browser/windows.git
-	${MAKE} -C windows/linux do-build
+
+	( cd windows/linux && \
+	  pwd && \
+	  ${MAKE} fetch && \
+	  ${MAKE} all && \
+	  cp -v $(outfiles) ../.. )
+
 	sha256sum $(outfile-exe) > $(outfile-exe).sha256sum
 	cat $(outfile-exe).sha256sum
 	sha256sum $(outfile-zip) > $(outfile-zip).sha256sum
 	cat /$(outfile-zip).sha256sum
 
-do-build :
-
-	pwd
-	${MAKE} -f Makefile fetch
-	${MAKE} -f Makefile all
-	cp -v $(outfiles) ../..

From ccaa7d6cbf39855dedc165e9224b631e20f90ff9 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 7 Feb 2023 13:26:27 +0100
Subject: [PATCH 12/21] one-character bug

---
 assets/windows.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/windows.mk b/assets/windows.mk
index f0f6ad4..9e32a4b 100644
--- a/assets/windows.mk
+++ b/assets/windows.mk
@@ -34,5 +34,5 @@ build :
 	sha256sum $(outfile-exe) > $(outfile-exe).sha256sum
 	cat $(outfile-exe).sha256sum
 	sha256sum $(outfile-zip) > $(outfile-zip).sha256sum
-	cat /$(outfile-zip).sha256sum
+	cat $(outfile-zip).sha256sum
 

From 78364ce6758be12bcc822dea56973691b125b22a Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 7 Feb 2023 14:39:47 +0100
Subject: [PATCH 13/21] Tue Feb  7 02:39:47 PM CET 2023

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4065e7b..3dff859 100644
--- a/README.md
+++ b/README.md
@@ -35,3 +35,4 @@ repository. Then you can just build the target you want with:
 This will pull a prebuilt build environment from
 [this repository](https://gitlab.com/librewolf-community/browser/bsys5/container_registry).
 If you also want to build that yourself, run `make docker-<TARGET>` first.
+

From f4816d64abf1d0639c3cbd6cf9cc67e090ac08cc Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 7 Feb 2023 15:20:02 +0100
Subject: [PATCH 14/21] add win32

---
 assets/windows.Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/windows.Dockerfile b/assets/windows.Dockerfile
index c1565a0..bc50d89 100644
--- a/assets/windows.Dockerfile
+++ b/assets/windows.Dockerfile
@@ -1,5 +1,6 @@
 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
 
 WORKDIR /root
 RUN git clone https://gitlab.com/librewolf-community/browser/windows.git

From d1c324ebd13f62641e55b6dd836369cf02bce0b8 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 7 Feb 2023 17:43:15 +0100
Subject: [PATCH 15/21] try3

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 3dff859..4065e7b 100644
--- a/README.md
+++ b/README.md
@@ -35,4 +35,3 @@ repository. Then you can just build the target you want with:
 This will pull a prebuilt build environment from
 [this repository](https://gitlab.com/librewolf-community/browser/bsys5/container_registry).
 If you also want to build that yourself, run `make docker-<TARGET>` first.
-

From 807ffcb40d78f12cd2f248f4efa31828cdbfc81d Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 7 Feb 2023 23:05:47 +0100
Subject: [PATCH 16/21] Tue Feb  7 11:05:47 PM CET 2023

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4065e7b..3dff859 100644
--- a/README.md
+++ b/README.md
@@ -35,3 +35,4 @@ repository. Then you can just build the target you want with:
 This will pull a prebuilt build environment from
 [this repository](https://gitlab.com/librewolf-community/browser/bsys5/container_registry).
 If you also want to build that yourself, run `make docker-<TARGET>` first.
+

From e300624792847e40dd4b9c0e46818576b3544dcc Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Wed, 8 Feb 2023 07:50:16 +0100
Subject: [PATCH 17/21] Wed Feb  8 07:50:16 AM CET 2023

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 3dff859..4065e7b 100644
--- a/README.md
+++ b/README.md
@@ -35,4 +35,3 @@ repository. Then you can just build the target you want with:
 This will pull a prebuilt build environment from
 [this repository](https://gitlab.com/librewolf-community/browser/bsys5/container_registry).
 If you also want to build that yourself, run `make docker-<TARGET>` first.
-

From abb5a378f45056663aa1287da54e240c0ebca1d7 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 9 Feb 2023 00:08:31 +0100
Subject: [PATCH 18/21] Thu Feb  9 12:08:31 AM CET 2023

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4065e7b..3dff859 100644
--- a/README.md
+++ b/README.md
@@ -35,3 +35,4 @@ repository. Then you can just build the target you want with:
 This will pull a prebuilt build environment from
 [this repository](https://gitlab.com/librewolf-community/browser/bsys5/container_registry).
 If you also want to build that yourself, run `make docker-<TARGET>` first.
+

From 15f98171a358999cdea520bf894d37d54c937eb0 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 11 Feb 2023 13:24:51 +0100
Subject: [PATCH 19/21] uncommenting the matrix build parts

---
 .gitlab-ci.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3261f3..436b2e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,16 +15,16 @@ Build Docker Images:
   parallel:
     matrix:
       - DISTRO:
-#          - debian11
-#          - ubuntu20
-#          - ubuntu22
-#          - mint20
-#          - mint21
-#          - fedora37
-#          - fedora36
-#          - macos-x86_64
-#          - macos-aarch64
-#          - dind
+          - debian11
+          - ubuntu20
+          - ubuntu22
+          - mint20
+          - mint21
+          - fedora37
+          - fedora36
+          - macos-x86_64
+          - macos-aarch64
+          - dind
           - windows
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
@@ -38,15 +38,15 @@ Build:
   parallel:
     matrix:
       - DISTRO:
-#          - debian11
-#          - ubuntu20
-#          - ubuntu22
-#          - mint20
-#          - mint21
-#          - fedora37
-#          - fedora36
-#          - macos-x86_64
-#          - macos-aarch64
+          - debian11
+          - ubuntu20
+          - ubuntu22
+          - mint20
+          - mint21
+          - fedora37
+          - fedora36
+          - macos-x86_64
+          - macos-aarch64
           - windows
   image: registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO
   tags:

From 90f7b46f793d0557f00a24364d54927e43e0768c Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 11 Feb 2023 13:25:26 +0100
Subject: [PATCH 20/21] Sat Feb 11 01:25:26 PM CET 2023

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 436b2e9..570b421 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,6 @@ Build Docker Images:
   when: manual
   only:
     - master
-    - windocker
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags: [autoscale]
   parallel:

From 97fa92724d6e8ceb99b4246208c37e062861d258 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 11 Feb 2023 13:26:30 +0100
Subject: [PATCH 21/21] Sat Feb 11 01:26:30 PM CET 2023

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 3dff859..4065e7b 100644
--- a/README.md
+++ b/README.md
@@ -35,4 +35,3 @@ repository. Then you can just build the target you want with:
 This will pull a prebuilt build environment from
 [this repository](https://gitlab.com/librewolf-community/browser/bsys5/container_registry).
 If you also want to build that yourself, run `make docker-<TARGET>` first.
-