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] 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