From 903877f5f6b7cd59c9a232d07f3865dbf9dbaebc Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Sat, 26 Feb 2022 05:32:31 +0000
Subject: [PATCH 01/11] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d850ad..048e1ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,8 @@ docker-compose-test:
         - server/config/
         - jafner-tools/config/
   script:
+    - docker --version
+    - docker-compose --version
     - find ~+ -type f -name docker-compose.yml > composes.txt
     - find ~+/server/config/minecraft/ -type f -name *.yml >> composes.txt
     - for file in `cat composes.txt`; do docker-compose -f $file config; done

From a039ffcf5eea0ac51c41bfe5a8a6d8c2434fc464 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Sat, 26 Feb 2022 05:45:03 +0000
Subject: [PATCH 02/11] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 048e1ca..7dddee8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
 
 before_script:
   - apt-get -y update
-  - apt-get -y install git docker docker-compose
+  - apt-get -y install git docker
   # configure SSH keys
   - 'which ssh-agent || ( apt-get install -qq openssh-client )'
   - eval $(ssh-agent -s)
@@ -22,7 +22,6 @@ docker-compose-test:
         - jafner-tools/config/
   script:
     - docker --version
-    - docker-compose --version
     - find ~+ -type f -name docker-compose.yml > composes.txt
     - find ~+/server/config/minecraft/ -type f -name *.yml >> composes.txt
     - for file in `cat composes.txt`; do docker-compose -f $file config; done

From f384bb6615878ad585f85cbe59085573732608aa Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Sat, 26 Feb 2022 05:46:32 +0000
Subject: [PATCH 03/11] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7dddee8..4daf624 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ docker-compose-test:
     - docker --version
     - find ~+ -type f -name docker-compose.yml > composes.txt
     - find ~+/server/config/minecraft/ -type f -name *.yml >> composes.txt
-    - for file in `cat composes.txt`; do docker-compose -f $file config; done
+    - for file in `cat composes.txt`; do docker compose -f $file config; done
     - rm composes.txt
   
 

From 5ba4002f932de185967057b99d9d8d4c470f2470 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Sat, 26 Feb 2022 05:49:55 +0000
Subject: [PATCH 04/11] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4daf624..e861cf8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,8 @@ stages:
 
 before_script:
   - apt-get -y update
-  - apt-get -y install git docker
+  - apt-get -y install git
+  - apt-get -y install docker
   # configure SSH keys
   - 'which ssh-agent || ( apt-get install -qq openssh-client )'
   - eval $(ssh-agent -s)

From c3a2da1d876edfe87f8c7c18ebfcef55099b16a8 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Sat, 26 Feb 2022 06:09:03 +0000
Subject: [PATCH 05/11] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e861cf8..dbcec68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,16 +5,22 @@ stages:
 before_script:
   - apt-get -y update
   - apt-get -y install git
-  - apt-get -y install docker
+  - apt-get -y install ca-certificates curl gnupg lsb-release
+  - curl -fsSL https://download.docker.com/linux/debian/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/debian \
+  $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+  - apt-get -y update
+  - apt-get -y install docker-ce docker-ce-cli containerd.io
+  - docker --version
   # configure SSH keys
   - 'which ssh-agent || ( apt-get install -qq openssh-client )'
   - eval $(ssh-agent -s)
   - ssh-add <(echo "$SSH_PRIVATE_KEY")
   - mkdir -p ~/.ssh
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
- 
+
 docker-compose-test:
-  image: debian:bullseye
+  image: docker
   stage: test
   rules:
     - changes:
@@ -23,8 +29,8 @@ docker-compose-test:
         - jafner-tools/config/
   script:
     - docker --version
-    - find ~+ -type f -name docker-compose.yml > composes.txt
-    - find ~+/server/config/minecraft/ -type f -name *.yml >> composes.txt
+    - find ~ -type f -name docker-compose.yml > composes.txt
+    - find ~/server/config/minecraft/ -type f -name *.yml >> composes.txt
     - for file in `cat composes.txt`; do docker compose -f $file config; done
     - rm composes.txt
   

From a3dc275250b853aacce2e33b1651facb9d39fd8e Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Sat, 26 Feb 2022 06:09:30 +0000
Subject: [PATCH 06/11] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbcec68..55b6470 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ before_script:
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 
 docker-compose-test:
-  image: docker
+  image: debian:bullseye
   stage: test
   rules:
     - changes:

From ee2593d9b8702a68f2518291d2d887e72d792875 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Sat, 26 Feb 2022 06:10:14 +0000
Subject: [PATCH 07/11] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55b6470..684ccaf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,7 @@ before_script:
   - apt-get -y install git
   - apt-get -y install ca-certificates curl gnupg lsb-release
   - curl -fsSL https://download.docker.com/linux/debian/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/debian \
-  $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+  - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
   - apt-get -y update
   - apt-get -y install docker-ce docker-ce-cli containerd.io
   - docker --version

From 4a710a7f17904568a38d8e99c2a9fcbb181c4ba3 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Sat, 26 Feb 2022 06:11:22 +0000
Subject: [PATCH 08/11] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 684ccaf..fc5cd24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ before_script:
   - apt-get -y update
   - apt-get -y install git
   - apt-get -y install ca-certificates curl gnupg lsb-release
-  - curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg 
+  - curl -fsSL https://download.docker.com/linux/debian/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/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
   - apt-get -y update
   - apt-get -y install docker-ce docker-ce-cli containerd.io

From 89e2167f88c89aabc2f7ff80e31ae498d91c5094 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Sat, 26 Feb 2022 06:12:40 +0000
Subject: [PATCH 09/11] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc5cd24..755842b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,8 +28,8 @@ docker-compose-test:
         - jafner-tools/config/
   script:
     - docker --version
-    - find ~ -type f -name docker-compose.yml > composes.txt
-    - find ~/server/config/minecraft/ -type f -name *.yml >> composes.txt
+    - find ~+ -type f -name docker-compose.yml > composes.txt
+    - find ~+/server/config/minecraft/ -type f -name *.yml >> composes.txt
     - for file in `cat composes.txt`; do docker compose -f $file config; done
     - rm composes.txt
   

From 345fb2e3aafe633f078d944ce84c0ce05d1c17fc Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Sat, 26 Feb 2022 06:24:03 +0000
Subject: [PATCH 10/11] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 755842b..c3e3694 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,14 +3,23 @@ stages:
   - deploy
 
 before_script:
+  # install git
   - apt-get -y update
   - apt-get -y install git
+  # install prerequisites for docker
   - apt-get -y install ca-certificates curl gnupg lsb-release
   - curl -fsSL https://download.docker.com/linux/debian/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/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+  # install docker
   - apt-get -y update
   - apt-get -y install docker-ce docker-ce-cli containerd.io
   - docker --version
+  # install docker compose
+  - DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
+  - mkdir -p $DOCKER_CONFIG/cli-plugins
+  - curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose
+  - chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
+  - docker compose version
   # configure SSH keys
   - 'which ssh-agent || ( apt-get install -qq openssh-client )'
   - eval $(ssh-agent -s)
@@ -27,7 +36,6 @@ docker-compose-test:
         - server/config/
         - jafner-tools/config/
   script:
-    - docker --version
     - find ~+ -type f -name docker-compose.yml > composes.txt
     - find ~+/server/config/minecraft/ -type f -name *.yml >> composes.txt
     - for file in `cat composes.txt`; do docker compose -f $file config; done

From 5fe60dff890fdfa4825a12f28cc21cbab78b0d5e Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Sat, 26 Feb 2022 06:38:47 +0000
Subject: [PATCH 11/11] Remove lan-only traefik label

---
 server/config/gitlab/docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/config/gitlab/docker-compose.yml b/server/config/gitlab/docker-compose.yml
index 0f71a0d..dd8efc4 100644
--- a/server/config/gitlab/docker-compose.yml
+++ b/server/config/gitlab/docker-compose.yml
@@ -26,7 +26,6 @@ services:
     labels:
       - traefik.http.routers.gitlab.rule=Host(`gitlab.jafner.net`)
       - traefik.http.routers.gitlab.tls.certresolver=lets-encrypt
-      - traefik.http.routers.gitlab.middlewares=lan-only@file
       - traefik.http.services.gitlab.loadbalancer.server.port=80
 
 networks: