From 55aea5247335436d6f1b000a4b3c77fbccdb8887 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Tue, 1 Nov 2022 00:32:28 -0700
Subject: [PATCH] #36 for Gitlab

---
 server/config/gitlab/docker-compose.yml   | 12 ++++++++----
 server/config/gitlab/{.env => gitlab.env} |  1 +
 server/config/gitlab/project.env          |  0
 server/config/gitlab/runner.env           |  1 +
 4 files changed, 10 insertions(+), 4 deletions(-)
 rename server/config/gitlab/{.env => gitlab.env} (88%)
 delete mode 100644 server/config/gitlab/project.env
 create mode 100644 server/config/gitlab/runner.env

diff --git a/server/config/gitlab/docker-compose.yml b/server/config/gitlab/docker-compose.yml
index 66eee2e..6168700 100644
--- a/server/config/gitlab/docker-compose.yml
+++ b/server/config/gitlab/docker-compose.yml
@@ -15,6 +15,8 @@ services:
     hostname: 'gitlab.jafner.net'
     networks:
       - web
+    env_file:
+      - gitlab.env
     environment:
       GITLAB_OMNIBUS_CONFIG: |
         external_url 'https://gitlab.jafner.net'
@@ -103,8 +105,9 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     restart: "no"
-    environment:
-      - GODEBUG="x509ignoreCN=0"
+    env_file:
+      - gitlab.env
+      - runner.env
     volumes:
       - ${DOCKER_DATA}/runner-config:/etc/gitlab-runner
       - /var/run/docker.sock:/var/run/docker.sock
@@ -123,8 +126,9 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     restart: "no"
-    environment:
-      - GODEBUG="x509ignoreCN=0"
+    env_file:
+      - gitlab.env
+      - runner.env
     volumes:
       - ${DOCKER_DATA}/runner-config:/etc/gitlab-runner
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/server/config/gitlab/.env b/server/config/gitlab/gitlab.env
similarity index 88%
rename from server/config/gitlab/.env
rename to server/config/gitlab/gitlab.env
index 96d7bf5..63060dd 100644
--- a/server/config/gitlab/.env
+++ b/server/config/gitlab/gitlab.env
@@ -1,2 +1,3 @@
+# Volumes
 DOCKER_DATA=/home/joey/data/gitlab
 DOCKER_CONFIG=/home/joey/docker_config/gitlab
\ No newline at end of file
diff --git a/server/config/gitlab/project.env b/server/config/gitlab/project.env
deleted file mode 100644
index e69de29..0000000
diff --git a/server/config/gitlab/runner.env b/server/config/gitlab/runner.env
new file mode 100644
index 0000000..b3d0e43
--- /dev/null
+++ b/server/config/gitlab/runner.env
@@ -0,0 +1 @@
+GODEBUG="x509ignoreCN=0"
\ No newline at end of file