From 400d7f748a1f3ad508ea469456d5f146c17f39a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 19:38:46 +0200
Subject: [PATCH 01/26] add build-images stage

---
 .gitlab-ci.yml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55e117f..d010201 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,32 @@
 stages:
+  - build-images
   - build
   - release
   - deploy
 
+Build Docker Images:
+  stage: build-images
+  when: manual
+  image: docker
+  services:
+    - docker-dind
+  parallel:
+    matrix:
+      - DISTRO:
+          - debian11
+          - ubuntu20
+          - ubuntu21
+          - ubuntu22
+          - mint20
+          - fedora34
+          - fedora35
+          - macos-x86_64
+          - macos-aarch64
+  script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - make docker-$DISTRO
+    - docker push $CI_REGISTRY/librewolf-community/browser/bsys5/$DISTRO:latest
+
 Build:
   stage: build
   when: manual
@@ -34,7 +58,7 @@ Build:
     - echo VERSION=$(cat version) >> variables.env
     - echo RELEASE=$(cat release) >> variables.env
     - echo SOURCE_RELEASE=$(cat source_release) >> variables.env
-    - 't=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env'
+    - "t=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env"
   artifacts:
     paths:
       - librewolf-*.deb

From e886193c17356695a1b70a59cff3e7bfb3055e91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 19:41:22 +0200
Subject: [PATCH 02/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d010201..9961153 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,9 @@ stages:
 Build Docker Images:
   stage: build-images
   when: manual
-  image: docker
+  image: docker:latest
   services:
-    - docker-dind
+    - docker:latest-dind
   parallel:
     matrix:
       - DISTRO:

From ee411e17a75a5e587768801c60daa79a3bef8489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 19:42:28 +0200
Subject: [PATCH 03/26] test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9961153..aec5a2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,9 @@ stages:
 Build Docker Images:
   stage: build-images
   when: manual
-  image: docker:latest
+  image: docker
   services:
-    - docker:latest-dind
+    - docker:dind
   parallel:
     matrix:
       - DISTRO:

From 6d3c756ccefe837e6bc563c2f6aeed5e1147b861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 19:44:46 +0200
Subject: [PATCH 04/26] testing

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aec5a2e..7f669d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,9 @@ Build Docker Images:
           - fedora35
           - macos-x86_64
           - macos-aarch64
+  before_script:
+    - apt update
+    - apt install -y make
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - make docker-$DISTRO

From 0852211b14db0cc0766d20cef99ea672ecc42300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 19:47:45 +0200
Subject: [PATCH 05/26] testing

---
 .gitlab-ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f669d4..8b36213 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 Build Docker Images:
   stage: build-images
   when: manual
-  image: docker
+  image: ubuntu22
   services:
     - docker:dind
   parallel:
@@ -22,9 +22,6 @@ Build Docker Images:
           - fedora35
           - macos-x86_64
           - macos-aarch64
-  before_script:
-    - apt update
-    - apt install -y make
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - make docker-$DISTRO

From 7beeaaec6c414be6711895d232ed3a9121587354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 19:49:27 +0200
Subject: [PATCH 06/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b36213..700c93a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 Build Docker Images:
   stage: build-images
   when: manual
-  image: ubuntu22
+  image: ubuntu
   services:
     - docker:dind
   parallel:

From 1b0a4c691ede6e3a1d402e1d4234a03d85f11d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 19:51:00 +0200
Subject: [PATCH 07/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 700c93a..1c61b60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ Build Docker Images:
   when: manual
   image: ubuntu
   services:
+    - docker
     - docker:dind
   parallel:
     matrix:

From 915e6f398291cffa60633de5aa7ba01076ce56da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 19:55:55 +0200
Subject: [PATCH 08/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c61b60..1de5c2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,9 @@ stages:
 Build Docker Images:
   stage: build-images
   when: manual
-  image: ubuntu
+  image: docker
   services:
-    - docker
+    - gcc
     - docker:dind
   parallel:
     matrix:

From 67eb3fc9bb851a3e994550d0dd4f4e9878f1138d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:01:44 +0200
Subject: [PATCH 09/26] testing

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1de5c2a..e07a1a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,9 @@ Build Docker Images:
   when: manual
   image: docker
   services:
-    - gcc
+    - name: gcc
+      alias: make
+      command: ["make"]
     - docker:dind
   parallel:
     matrix:

From af7d9ea1cc7d0c78916e9678e544caa61d4199ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:13:55 +0200
Subject: [PATCH 10/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e07a1a5..b8f1088 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,11 +7,8 @@ stages:
 Build Docker Images:
   stage: build-images
   when: manual
-  image: docker
+  image: ubuntu
   services:
-    - name: gcc
-      alias: make
-      command: ["make"]
     - docker:dind
   parallel:
     matrix:
@@ -25,6 +22,9 @@ Build Docker Images:
           - fedora35
           - macos-x86_64
           - macos-aarch64
+  before_script:
+    - curl -fsSL https://get.docker.com -o get-docker.sh
+    - sudo sh get-docker.sh
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - make docker-$DISTRO

From 0869b830abbb618c8ed29fbe66fa61e4ff952a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:16:41 +0200
Subject: [PATCH 11/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8f1088..6604fa0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 Build Docker Images:
   stage: build-images
   when: manual
-  image: ubuntu
+  image: curlimages/curl
   services:
     - docker:dind
   parallel:

From d6780c59f32b7b2a7c72bd9c6df0b66936e8f4e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:20:48 +0200
Subject: [PATCH 12/26] test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6604fa0..5976535 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ Build Docker Images:
           - macos-aarch64
   before_script:
     - curl -fsSL https://get.docker.com -o get-docker.sh
-    - sudo sh get-docker.sh
+    - sh get-docker.sh
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - make docker-$DISTRO

From e360e3b6653fb6542c8caddcbc31c350eb280a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:25:13 +0200
Subject: [PATCH 13/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5976535..84cfece 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,8 +23,7 @@ Build Docker Images:
           - macos-x86_64
           - macos-aarch64
   before_script:
-    - curl -fsSL https://get.docker.com -o get-docker.sh
-    - sh get-docker.sh
+    - cd $(mktemp -d) && curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz && tar xf docker-20.10.9.tgz && cp -v docker/* /usr/bin/
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - make docker-$DISTRO

From 72e342112b2bcd279157ee2eeaf3faf25502b254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:28:57 +0200
Subject: [PATCH 14/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84cfece..b10a015 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ Build Docker Images:
           - macos-x86_64
           - macos-aarch64
   before_script:
-    - cd $(mktemp -d) && curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz && tar xf docker-20.10.9.tgz && cp -v docker/* /usr/bin/
+    - cd $(mktemp -d) && curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz -o docker.tgz && tar xzvf docker.tgz && cp -v docker/* /usr/bin/
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - make docker-$DISTRO

From c39ca3f3f6dbed4fbc1194862bb64ee65db5dbd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:31:22 +0200
Subject: [PATCH 15/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b10a015..8ff2844 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ Build Docker Images:
           - macos-x86_64
           - macos-aarch64
   before_script:
-    - cd $(mktemp -d) && curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz -o docker.tgz && tar xzvf docker.tgz && cp -v docker/* /usr/bin/
+    - cd $(mktemp -d) && curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz -o docker.tgz && tar xzvf docker.tgz && cp -v docker/* ~/.local/bin/
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - make docker-$DISTRO

From d5df2cfb98f907d5e0871de76973566dfd0454d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:33:13 +0200
Subject: [PATCH 16/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ff2844..8424285 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ Build Docker Images:
           - macos-x86_64
           - macos-aarch64
   before_script:
-    - cd $(mktemp -d) && curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz -o docker.tgz && tar xzvf docker.tgz && cp -v docker/* ~/.local/bin/
+    - cd $(mktemp -d) && curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz -o docker.tgz && tar xzvf docker.tgz && mkdir -p ~/.local/bin/ && cp -v docker/* ~/.local/bin/
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - make docker-$DISTRO

From 923c07289f7a18d1cdc8aa0154debee01a9454bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:36:33 +0200
Subject: [PATCH 17/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8424285..612f5e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 Build Docker Images:
   stage: build-images
   when: manual
-  image: curlimages/curl
+  image: ubuntu
   services:
     - docker:dind
   parallel:
@@ -22,8 +22,15 @@ Build Docker Images:
           - fedora35
           - macos-x86_64
           - macos-aarch64
+  # Install docker
   before_script:
-    - cd $(mktemp -d) && curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz -o docker.tgz && tar xzvf docker.tgz && mkdir -p ~/.local/bin/ && cp -v docker/* ~/.local/bin/
+    - apt-get update
+    - apt-get install ca-certificates curl gnupg lsb-release
+    - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+    - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+    - apt-get update
+    - apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
+  # Build container
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - make docker-$DISTRO

From 5a1c9583a84362883daa34c258c1db7403d9b6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:38:02 +0200
Subject: [PATCH 18/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 612f5e5..dde8348 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,11 +25,11 @@ Build Docker Images:
   # Install docker
   before_script:
     - apt-get update
-    - apt-get install ca-certificates curl gnupg lsb-release
+    - apt-get install -y ca-certificates curl gnupg lsb-release
     - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
     - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
     - apt-get update
-    - apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
+    - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
   # Build container
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY

From bdc400baadfbc78e849fb9fc2697641282e810fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:39:50 +0200
Subject: [PATCH 19/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dde8348..1c195b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ Build Docker Images:
   before_script:
     - apt-get update
     - apt-get install -y ca-certificates curl gnupg lsb-release
-    - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+    - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
     - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
     - apt-get update
     - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin

From 6233a835f7a3ed97d5fece63f94acc25d4fc3e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:42:10 +0200
Subject: [PATCH 20/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c195b7..fbc97ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ stages:
 Build Docker Images:
   stage: build-images
   when: manual
+  only:
+    - master
   image: ubuntu
   services:
     - docker:dind
@@ -22,14 +24,14 @@ Build Docker Images:
           - fedora35
           - macos-x86_64
           - macos-aarch64
-  # Install docker
+  # Install docker and make
   before_script:
     - apt-get update
     - apt-get install -y ca-certificates curl gnupg lsb-release
     - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
     - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
     - apt-get update
-    - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+    - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin make
   # Build container
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY

From 9de855e7ef355692aa666214c3df47820a5e5f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:42:31 +0200
Subject: [PATCH 21/26] testing

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbc97ad..2c20df9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,8 @@ stages:
 Build Docker Images:
   stage: build-images
   when: manual
-  only:
-    - master
+  # only:
+  #   - master
   image: ubuntu
   services:
     - docker:dind

From 1a52e7f6e4874e124a4e842f7bf62577cedbfbc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 20:51:22 +0200
Subject: [PATCH 22/26] testing

---
 .gitlab-ci.yml  | 2 +-
 assets/linux.mk | 2 +-
 assets/macos.mk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c20df9..1f73d60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ Build Docker Images:
   # Build container
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - make docker-$DISTRO
+    - DOCKER_HOST="tcp://docker:2375" make docker-$DISTRO
     - docker push $CI_REGISTRY/librewolf-community/browser/bsys5/$DISTRO:latest
 
 Build:
diff --git a/assets/linux.mk b/assets/linux.mk
index b6b403c..3d02d7f 100644
--- a/assets/linux.mk
+++ b/assets/linux.mk
@@ -12,7 +12,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
 outfile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2
 
 docker :
-	docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile
+	docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/$(distro):latest - < assets/linux.Dockerfile
 
 build : $(outfile) $(outfile).sha256sum
 
diff --git a/assets/macos.mk b/assets/macos.mk
index ddc1c4e..d6ba4af 100644
--- a/assets/macos.mk
+++ b/assets/macos.mk
@@ -11,7 +11,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
 outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg
 
 docker :
-	docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile
+	docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/macos:$(arch) - < assets/macos.Dockerfile
 
 build : $(outfile) $(outfile).sha256sum
 

From 96d14c4c8704eb8b42fc6750523cc03ab529683d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 21:12:18 +0200
Subject: [PATCH 23/26] testing

---
 .gitlab-ci.yml  | 8 +++++---
 assets/linux.mk | 2 +-
 assets/macos.mk | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f73d60..1579ecd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,8 @@ Build Docker Images:
           - fedora35
           - macos-x86_64
           - macos-aarch64
+  variables:
+    DOCKER_HOST: tcp://docker:2375
   # Install docker and make
   before_script:
     - apt-get update
@@ -34,9 +36,9 @@ Build Docker Images:
     - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin make
   # Build container
   script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - DOCKER_HOST="tcp://docker:2375" make docker-$DISTRO
-    - docker push $CI_REGISTRY/librewolf-community/browser/bsys5/$DISTRO:latest
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
+    - make docker-$DISTRO
+    - docker push registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest
 
 Build:
   stage: build
diff --git a/assets/linux.mk b/assets/linux.mk
index 3d02d7f..2c2dded 100644
--- a/assets/linux.mk
+++ b/assets/linux.mk
@@ -12,7 +12,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
 outfile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2
 
 docker :
-	docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/$(distro):latest - < assets/linux.Dockerfile
+	docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/$(distro):latest - < assets/linux.Dockerfile
 
 build : $(outfile) $(outfile).sha256sum
 
diff --git a/assets/macos.mk b/assets/macos.mk
index d6ba4af..a85666b 100644
--- a/assets/macos.mk
+++ b/assets/macos.mk
@@ -11,7 +11,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
 outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg
 
 docker :
-	docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/macos:$(arch) - < assets/macos.Dockerfile
+	docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/macos:$(arch) - < assets/macos.Dockerfile
 
 build : $(outfile) $(outfile).sha256sum
 

From a65e96ecbc40506aa58f29a39bb282732ce7660f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 21:50:01 +0200
Subject: [PATCH 24/26] changes

---
 .gitlab-ci.yml            |  6 +++---
 Makefile                  | 36 ++++++++++++++++++------------------
 assets/linux.artifacts.mk |  4 ++--
 assets/linux.mk           |  2 +-
 assets/macos.mk           |  2 +-
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1579ecd..8aa6671 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,11 @@
 stages:
-  - build-images
+  - buildImages
   - build
   - release
   - deploy
 
 Build Docker Images:
-  stage: build-images
+  stage: buildImages
   when: manual
   # only:
   #   - master
@@ -59,7 +59,7 @@ Build:
   variables:
     SOURCE_URL: $SOURCE_URL
     use_docker: "false"
-  image: librewolf/bsys5-image-$DISTRO
+  image: registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO
   tags:
     - amd64
     # Build on dedicated runner
diff --git a/Makefile b/Makefile
index d635160..afbc497 100644
--- a/Makefile
+++ b/Makefile
@@ -72,26 +72,26 @@ build :
 	${MAKE} clean
 
 push :
-	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-ubuntu22
-	docker push librewolf/bsys5-image-fedora34
-	docker push librewolf/bsys5-image-fedora35
-	docker push librewolf/bsys5-image-macos-x86_64
-	docker push librewolf/bsys5-image-macos-aarch64
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint20
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora35
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos:x86_64
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos:aarch64
 
 rmi :
-	docker rmi librewolf/bsys5-image-debian11
-	docker rmi librewolf/bsys5-image-mint20
-	docker rmi librewolf/bsys5-image-ubuntu20
-	docker rmi librewolf/bsys5-image-ubuntu21
-	docker rmi librewolf/bsys5-image-ubuntu22
-	docker rmi librewolf/bsys5-image-fedora34
-	docker rmi librewolf/bsys5-image-fedora35
-	docker rmi librewolf/bsys5-image-macos-x86_64
-	docker rmi librewolf/bsys5-image-macos-aarch64
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint20
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora35
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos:x86_64
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos:aarch64
 
 update :
 	@wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version"
diff --git a/assets/linux.artifacts.mk b/assets/linux.artifacts.mk
index 4c1dc33..8ce9269 100644
--- a/assets/linux.artifacts.mk
+++ b/assets/linux.artifacts.mk
@@ -23,7 +23,7 @@ librewolf-$(full_version).en-US.$(distro).x86_64.deb : $(infile)
 ifeq ($(use_docker),false)
 	(cd work && bash linux.build-deb.sh $(full_version))
 else
-	docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-deb.sh $(full_version)"
+	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "bash linux.build-deb.sh $(full_version)"
 endif
 	cp -v work/librewolf.deb $@
 	sha256sum $@ > $@.sha256sum
@@ -55,7 +55,7 @@ ifeq ($(use_docker),false)
 	(cp -r work / && cd work && bash linux.build-rpm.sh $(fc))
 	cp -v /work/$@ $@
 else
-	docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-rpm.sh $(fc)"
+	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "bash linux.build-rpm.sh $(fc)"
 	cp -v work/$@ $@
 endif
 	sha256sum $@ > $@.sha256sum
diff --git a/assets/linux.mk b/assets/linux.mk
index 2c2dded..c83802e 100644
--- a/assets/linux.mk
+++ b/assets/linux.mk
@@ -21,7 +21,7 @@ $(outfile) :
 ifeq ($(use_docker),false)
 	(cd work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales)
 else
-	docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales"
+	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales"
 endif
 	cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile)
 
diff --git a/assets/macos.mk b/assets/macos.mk
index a85666b..111fdb1 100644
--- a/assets/macos.mk
+++ b/assets/macos.mk
@@ -21,7 +21,7 @@ $(outfile) :
 ifeq ($(use_docker),false)
 	(cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package)
 else
-	docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package"
+	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos:$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package"
 endif
 	cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile)
 

From 468ae43323383ac47f83b689a57c8a2868538b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 22:06:53 +0200
Subject: [PATCH 25/26] fix error

---
 Makefile        | 8 ++++----
 assets/macos.mk | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index afbc497..22e99fc 100644
--- a/Makefile
+++ b/Makefile
@@ -79,8 +79,8 @@ push :
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora35
-	docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos:x86_64
-	docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos:aarch64
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
 
 rmi :
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11
@@ -90,8 +90,8 @@ rmi :
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora35
-	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos:x86_64
-	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos:aarch64
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
 
 update :
 	@wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version"
diff --git a/assets/macos.mk b/assets/macos.mk
index 111fdb1..246b6b9 100644
--- a/assets/macos.mk
+++ b/assets/macos.mk
@@ -11,7 +11,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
 outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg
 
 docker :
-	docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/macos:$(arch) - < assets/macos.Dockerfile
+	docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) - < assets/macos.Dockerfile
 
 build : $(outfile) $(outfile).sha256sum
 
@@ -21,7 +21,7 @@ $(outfile) :
 ifeq ($(use_docker),false)
 	(cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package)
 else
-	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos:$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package"
+	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package"
 endif
 	cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile)
 

From 113855e946566ff1f5f5ae633f84527232644ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Tue, 10 May 2022 22:16:22 +0200
Subject: [PATCH 26/26] rename images stage and add fedora36

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9fcbf85..3465eba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,11 @@
 stages:
-  - buildImages
+  - images
   - build
   - release
   - deploy
 
 Build Docker Images:
-  stage: buildImages
+  stage: images
   when: manual
   # only:
   #   - master
@@ -22,6 +22,7 @@ Build Docker Images:
           - mint20
           - fedora34
           - fedora35
+          - fedora36
           - macos-x86_64
           - macos-aarch64
   variables: