From d118ef6bf21716084fb8b765a71c7a4ff947d52a Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 12:29:30 -0400
Subject: [PATCH 01/39] First test configuration of GitLab Runner

---
 templates/GitLab-Runner/0/README.md           |  1 +
 templates/GitLab-Runner/0/docker-compose.yml  | 43 ++++++++++++
 templates/GitLab-Runner/0/rancher-compose.yml | 67 +++++++++++++++++++
 templates/GitLab-Runner/config.yml            |  8 +++
 4 files changed, 119 insertions(+)
 create mode 100644 templates/GitLab-Runner/0/README.md
 create mode 100644 templates/GitLab-Runner/0/docker-compose.yml
 create mode 100644 templates/GitLab-Runner/0/rancher-compose.yml
 create mode 100644 templates/GitLab-Runner/config.yml

diff --git a/templates/GitLab-Runner/0/README.md b/templates/GitLab-Runner/0/README.md
new file mode 100644
index 0000000..eaa71b8
--- /dev/null
+++ b/templates/GitLab-Runner/0/README.md
@@ -0,0 +1 @@
+# GitLab Runner
\ No newline at end of file
diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
new file mode 100644
index 0000000..18b13f8
--- /dev/null
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -0,0 +1,43 @@
+version: '2'
+
+services:
+  gitlab-runner:
+    image: gitlab/gitlab-runner:alpine
+    command:
+      - register
+      - --non-interactive
+      - --url
+      - ${GITLAB_URL}
+      - --registration-token
+      - ${GITLAB_TOKEN}
+      - --executor
+      - "docker"
+      - --docker-image
+      - alpine:latest
+      {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
+      - --description
+      - ${GITLAB_RUNNER_DESCRIPTION}
+      {{- end}}
+      {{- if .Values.GITLAB_TAGS}}
+      - --tag-list
+      - ${GITLAB_TAGS}
+      {{- end}}
+      - --run-untagged
+      - --locked="false"
+    dns:
+      - 1.1.1.1
+      - 1.0.0.1
+    environment:
+    {{- if .Values.GITLAB_LINK}}
+    external_links:
+      - ${GITLAB_LINK}{{- if .Values.GITLAB_LINK_ALIAS}}:${GITLAB_LINK_ALIAS}{{- end}}
+    {{- end}}
+    labels:
+      io.rancher.container.pull_image: always
+      {{- if .Values.HOST_LABEL}}
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- end}}
+      traefik.enable: false
+    restart: on-failure
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
\ No newline at end of file
diff --git a/templates/GitLab-Runner/0/rancher-compose.yml b/templates/GitLab-Runner/0/rancher-compose.yml
new file mode 100644
index 0000000..1de9c9d
--- /dev/null
+++ b/templates/GitLab-Runner/0/rancher-compose.yml
@@ -0,0 +1,67 @@
+version: '2'
+catalog:
+  name: GitLab Runner
+  version: latest
+  # description:
+  # minimum_rancher_version:
+  # maximum_rancher_version:
+  # upgrade_from:
+  # uuid:
+  questions:
+
+    - variable: "HOST_LABEL"
+      label: "Host Label Key/Value Pair"
+      description: |
+        (Optional) The Key/Value pair of the host which the stack should be deployed.
+      default: "host.id=Host2"
+      required: false
+      type: string
+
+    - variable: "GITLAB_URL"
+      label: "GitLab URL"
+      description: |
+        The URL which your GitLab instance can be reached at.
+        You can use the service selection and alias to create a direct link if it is in your Rancher environment.
+      default: "http://gitlab/"
+      required: true
+      type: string
+
+    - variable: "GITLAB_TOKEN"
+      label: "GitLab Registration Token"
+      description: |
+        The registration token provided by the GitLab instance.
+      # default:
+      required: true
+      type: string
+
+    - variable: "GITLAB_RUNNER_DESCRIPTION"
+      label: "GitLab Runner Description"
+      description: |
+        (Optional) A description for the GitLab Runner.
+      # default:
+      required: false
+      type: string
+
+    - variable: "GITLAB_TAGS"
+      label: "GitLab Runner Tags"
+      description: |
+        (Optional) Tags for the GitLab Runner, separated by a comma.
+        These can be changed later in GitLab.
+      default: "docker"
+      required: false
+      type: string
+
+    - variable: "GITLAB_LINK"
+      label: "GitLab Service"
+      description: |
+        (Optional) Create a direct link to the GitLab service.
+      required: false
+      type: service
+
+    - variable: "GITLAB_LINK_ALIAS"
+      label: "GitLab Service Alias"
+      description: |
+        (Optional) Create an alias for the service.
+      default: "gitlab"
+      required: false
+      type: string
\ No newline at end of file
diff --git a/templates/GitLab-Runner/config.yml b/templates/GitLab-Runner/config.yml
new file mode 100644
index 0000000..2da9a7d
--- /dev/null
+++ b/templates/GitLab-Runner/config.yml
@@ -0,0 +1,8 @@
+name: GitLab Runner
+description: |
+  STATUS: Experimental
+version: latest
+# category:
+maintainer: WilliamMiceli
+# license:
+# projectURL:
\ No newline at end of file

From dc50d5c76411cf354b787abf65f8a9e8015fa1d6 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 12:32:39 -0400
Subject: [PATCH 02/39] Removed environment section

---
 templates/GitLab-Runner/0/docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 18b13f8..9ffa16a 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -27,7 +27,6 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
-    environment:
     {{- if .Values.GITLAB_LINK}}
     external_links:
       - ${GITLAB_LINK}{{- if .Values.GITLAB_LINK_ALIAS}}:${GITLAB_LINK_ALIAS}{{- end}}

From 1f4630152ae0ee647454d36da1269fdca4d28c78 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 12:35:44 -0400
Subject: [PATCH 03/39] GitLab unable to parse escaped double quotes

---
 templates/GitLab-Runner/0/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 9ffa16a..1aab328 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       - ${GITLAB_TAGS}
       {{- end}}
       - --run-untagged
-      - --locked="false"
+      - --locked=false
     dns:
       - 1.1.1.1
       - 1.0.0.1

From 11602e36dce4bb690d0a2b9e05c675160f0644f3 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 13:25:22 -0400
Subject: [PATCH 04/39] Will try to use the same service for registration and
 running

---
 templates/GitLab-Runner/0/docker-compose.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 1aab328..60d65ca 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -23,7 +23,8 @@ services:
       - ${GITLAB_TAGS}
       {{- end}}
       - --run-untagged
-      - --locked=false
+      - --locked=false;
+      - run
     dns:
       - 1.1.1.1
       - 1.0.0.1

From 15b5593a59e310bcc7bf2ddb588d8ad0f473e866 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 13:32:09 -0400
Subject: [PATCH 05/39] Needed separation

---
 templates/GitLab-Runner/0/docker-compose.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 60d65ca..2e7746e 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -23,7 +23,8 @@ services:
       - ${GITLAB_TAGS}
       {{- end}}
       - --run-untagged
-      - --locked=false;
+      - --locked=false
+      - ;
       - run
     dns:
       - 1.1.1.1

From 2fa4c615f39e18bd4aafad86a76d462d4cc6e6db Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 13:47:55 -0400
Subject: [PATCH 06/39] Now two separate services

---
 templates/GitLab-Runner/0/docker-compose.yml  | 28 ++++++++++++++++---
 templates/GitLab-Runner/0/rancher-compose.yml |  8 ++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 2e7746e..2a27b03 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 
 services:
-  gitlab-runner:
+  gitlab-runner-config:
     image: gitlab/gitlab-runner:alpine
     command:
       - register
@@ -24,8 +24,6 @@ services:
       {{- end}}
       - --run-untagged
       - --locked=false
-      - ;
-      - run
     dns:
       - 1.1.1.1
       - 1.0.0.1
@@ -41,4 +39,26 @@ services:
       traefik.enable: false
     restart: on-failure
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
\ No newline at end of file
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
+  gitlab-runner:
+    image: gitlab/gitlab-runner:alpine
+    command:
+      - run
+    dns:
+      - 1.1.1.1
+      - 1.0.0.1
+    {{- if .Values.GITLAB_LINK}}
+    external_links:
+      - ${GITLAB_LINK}{{- if .Values.GITLAB_LINK_ALIAS}}:${GITLAB_LINK_ALIAS}{{- end}}
+    {{- end}}
+    labels:
+      io.rancher.container.pull_image: always
+      {{- if .Values.HOST_LABEL}}
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- end}}
+      io.rancher.sidekicks: gitlab-runner-config
+      traefik.enable: false
+    restart: on-failure
+    volumes-from:
+      - gitlab-runner-config
\ No newline at end of file
diff --git a/templates/GitLab-Runner/0/rancher-compose.yml b/templates/GitLab-Runner/0/rancher-compose.yml
index 1de9c9d..be2c9f2 100644
--- a/templates/GitLab-Runner/0/rancher-compose.yml
+++ b/templates/GitLab-Runner/0/rancher-compose.yml
@@ -64,4 +64,12 @@ catalog:
         (Optional) Create an alias for the service.
       default: "gitlab"
       required: false
+      type: string
+
+    - variable: "DATA_DIR"
+      label: "Data Directory"
+      description: |
+        The directory to store persistent data for the stack.
+      default: "Personal/GitLab-Runner"
+      required: true
       type: string
\ No newline at end of file

From f7014f8c5d19f61f01cd5bfd0538443ca3f34045 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 13:52:36 -0400
Subject: [PATCH 07/39] Fixed typo

---
 templates/GitLab-Runner/0/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 2a27b03..8475383 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -60,5 +60,5 @@ services:
       io.rancher.sidekicks: gitlab-runner-config
       traefik.enable: false
     restart: on-failure
-    volumes-from:
+    volumes_from:
       - gitlab-runner-config
\ No newline at end of file

From a545055f5c8b2e194fd44fc357f42c663024b9dc Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 13:56:33 -0400
Subject: [PATCH 08/39] Config should only start once

---
 templates/GitLab-Runner/0/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 8475383..b14ef50 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -33,11 +33,11 @@ services:
     {{- end}}
     labels:
       io.rancher.container.pull_image: always
+      io.rancher.container.start_once: true
       {{- if .Values.HOST_LABEL}}
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
       traefik.enable: false
-    restart: on-failure
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner

From 0a76545715d1be67f6a0a9057a41a62780c9d76e Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 14:04:54 -0400
Subject: [PATCH 09/39] Removed DNS declaration

---
 templates/GitLab-Runner/0/docker-compose.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index b14ef50..d01f5ac 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -24,9 +24,6 @@ services:
       {{- end}}
       - --run-untagged
       - --locked=false
-    dns:
-      - 1.1.1.1
-      - 1.0.0.1
     {{- if .Values.GITLAB_LINK}}
     external_links:
       - ${GITLAB_LINK}{{- if .Values.GITLAB_LINK_ALIAS}}:${GITLAB_LINK_ALIAS}{{- end}}
@@ -45,9 +42,6 @@ services:
     image: gitlab/gitlab-runner:alpine
     command:
       - run
-    dns:
-      - 1.1.1.1
-      - 1.0.0.1
     {{- if .Values.GITLAB_LINK}}
     external_links:
       - ${GITLAB_LINK}{{- if .Values.GITLAB_LINK_ALIAS}}:${GITLAB_LINK_ALIAS}{{- end}}

From 3554e82bf50da1c81a60f02228cec10184d76fcb Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 14:13:46 -0400
Subject: [PATCH 10/39] Changed what container owns the volumes

---
 templates/GitLab-Runner/0/docker-compose.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index d01f5ac..793fe45 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -35,9 +35,8 @@ services:
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
       traefik.enable: false
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
+    volumes_from:
+      - gitlab-runner-config
   gitlab-runner:
     image: gitlab/gitlab-runner:alpine
     command:
@@ -54,5 +53,6 @@ services:
       io.rancher.sidekicks: gitlab-runner-config
       traefik.enable: false
     restart: on-failure
-    volumes_from:
-      - gitlab-runner-config
\ No newline at end of file
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
\ No newline at end of file

From e162d65bcf779c2a79c0a9ae529d2be26a28ce36 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 14:16:16 -0400
Subject: [PATCH 11/39] Fixed volumes_from

---
 templates/GitLab-Runner/0/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 793fe45..c3b7d9c 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -36,7 +36,7 @@ services:
       {{- end}}
       traefik.enable: false
     volumes_from:
-      - gitlab-runner-config
+      - gitlab-runner
   gitlab-runner:
     image: gitlab/gitlab-runner:alpine
     command:

From 4e44f510ee6ef801d65f63c403900c20149e8dc4 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 14:17:51 -0400
Subject: [PATCH 12/39] Removed default tag

---
 templates/GitLab-Runner/0/rancher-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/rancher-compose.yml b/templates/GitLab-Runner/0/rancher-compose.yml
index be2c9f2..e9833aa 100644
--- a/templates/GitLab-Runner/0/rancher-compose.yml
+++ b/templates/GitLab-Runner/0/rancher-compose.yml
@@ -47,7 +47,7 @@ catalog:
       description: |
         (Optional) Tags for the GitLab Runner, separated by a comma.
         These can be changed later in GitLab.
-      default: "docker"
+      # default:
       required: false
       type: string
 

From 70cd6a796f4ececd2f8e0a3077cae33ee7915db3 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 14:20:29 -0400
Subject: [PATCH 13/39] Configuration wasn't able to be written

---
 templates/GitLab-Runner/0/docker-compose.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index c3b7d9c..7136780 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -35,8 +35,9 @@ services:
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
       traefik.enable: false
-    volumes_from:
-      - gitlab-runner
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
   gitlab-runner:
     image: gitlab/gitlab-runner:alpine
     command:

From 3d06ae60bfc73231fb14852f72ca2e1a6259e2a8 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Tue, 12 Mar 2019 14:36:29 -0400
Subject: [PATCH 14/39] Set default tags to "docker" again

---
 templates/GitLab-Runner/0/rancher-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/rancher-compose.yml b/templates/GitLab-Runner/0/rancher-compose.yml
index e9833aa..be2c9f2 100644
--- a/templates/GitLab-Runner/0/rancher-compose.yml
+++ b/templates/GitLab-Runner/0/rancher-compose.yml
@@ -47,7 +47,7 @@ catalog:
       description: |
         (Optional) Tags for the GitLab Runner, separated by a comma.
         These can be changed later in GitLab.
-      # default:
+      default: "docker"
       required: false
       type: string
 

From 88846d2e764f0a5ac24607994ae2dafa681b0cce Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 14 Mar 2019 18:00:47 -0400
Subject: [PATCH 15/39] Added some more links

---
 Cool Stuff.md | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Cool Stuff.md b/Cool Stuff.md
index fe1f71e..944bb0c 100644
--- a/Cool Stuff.md	
+++ b/Cool Stuff.md	
@@ -17,8 +17,24 @@
 [https://bitwarden.com/]
 [https://help.bitwarden.com/article/install-on-premise/]
 [https://www.passbolt.com/]
-
-
+[https://hub.docker.com/r/libreplan/libreplan/]
+[https://hub.docker.com/r/fjudith/draw.io]
+[https://hub.docker.com/r/linuxserver/openvpn-as]
+[https://hub.docker.com/_/drupal]
+[https://hub.docker.com/_/redmine]
+[https://hub.docker.com/_/node]
+[https://hub.docker.com/r/zabbix/zabbix-server-mysql]
+[https://hub.docker.com/r/zulip/zulip-postgresql]
+[https://hub.docker.com/r/zulip/docker-zulip]
+[https://hub.docker.com/r/openhab/openhab]
+[https://hub.docker.com/r/devdocs/devdocs]
+[https://hub.docker.com/r/bitnami/opencart]
+[https://polrproject.org/]
+[https://hub.docker.com/r/prestashop/prestashop]
+[https://wiki.js.org/]
+[https://getcockpit.com/]
+[https://hub.docker.com/r/agentejo/cockpit]
+[https://hub.docker.com/r/homeassistant/home-assistant]
 
 ###### GitLab Runner
 

From 2ece97ced346e3d38d56de33c2d24f24a997ff9d Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 15 Mar 2019 09:39:53 -0400
Subject: [PATCH 16/39] Testing more condensed style

---
 templates/GitLab-Runner/0/docker-compose.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 7136780..252426d 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -6,21 +6,15 @@ services:
     command:
       - register
       - --non-interactive
-      - --url
-      - ${GITLAB_URL}
-      - --registration-token
-      - ${GITLAB_TOKEN}
-      - --executor
-      - "docker"
-      - --docker-image
-      - alpine:latest
+      - --url ${GITLAB_URL}
+      - --registration-token ${GITLAB_TOKEN}
+      - --executor "docker"
+      - --docker-image alpine:latest
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
-      - --description
-      - ${GITLAB_RUNNER_DESCRIPTION}
+      - --description ${GITLAB_RUNNER_DESCRIPTION}
       {{- end}}
       {{- if .Values.GITLAB_TAGS}}
-      - --tag-list
-      - ${GITLAB_TAGS}
+      - --tag-list ${GITLAB_TAGS}
       {{- end}}
       - --run-untagged
       - --locked=false

From 0f8f1721466f346bec4f0cb35333db2f493b6939 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 15 Mar 2019 09:45:41 -0400
Subject: [PATCH 17/39] Testing with single quote encapsulation

---
 templates/GitLab-Runner/0/docker-compose.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 252426d..2b2bac7 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -6,15 +6,15 @@ services:
     command:
       - register
       - --non-interactive
-      - --url ${GITLAB_URL}
-      - --registration-token ${GITLAB_TOKEN}
-      - --executor "docker"
-      - --docker-image alpine:latest
+      - '--url ${GITLAB_URL}'
+      - '--registration-token ${GITLAB_TOKEN}'
+      - '--executor "docker"'
+      - '--docker-image alpine:latest'
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
-      - --description ${GITLAB_RUNNER_DESCRIPTION}
+      - '--description ${GITLAB_RUNNER_DESCRIPTION}'
       {{- end}}
       {{- if .Values.GITLAB_TAGS}}
-      - --tag-list ${GITLAB_TAGS}
+      - '--tag-list ${GITLAB_TAGS}'
       {{- end}}
       - --run-untagged
       - --locked=false

From d7ecb40d60724e43d4c346d657359bad75500c99 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 15 Mar 2019 09:50:58 -0400
Subject: [PATCH 18/39] Revert "Testing more condensed style"

This reverts commit 2ece97ced346e3d38d56de33c2d24f24a997ff9d.

# Conflicts:
#	templates/GitLab-Runner/0/docker-compose.yml
---
 templates/GitLab-Runner/0/docker-compose.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 2b2bac7..6830137 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -6,15 +6,21 @@ services:
     command:
       - register
       - --non-interactive
-      - '--url ${GITLAB_URL}'
-      - '--registration-token ${GITLAB_TOKEN}'
-      - '--executor "docker"'
-      - '--docker-image alpine:latest'
+      - --url
+      - ${GITLAB_URL}
+      - --registration-token
+      - ${GITLAB_TOKEN}
+      - --executor
+      - "docker"
+      - --docker-image
+      - alpine:latest
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
-      - '--description ${GITLAB_RUNNER_DESCRIPTION}'
+      - --description
+      - ${GITLAB_RUNNER_DESCRIPTION}
       {{- end}}
       {{- if .Values.GITLAB_TAGS}}
-      - '--tag-list ${GITLAB_TAGS}'
+      - --tag-list
+      - ${GITLAB_TAGS}
       {{- end}}
       - --run-untagged
       - --locked=false
@@ -50,4 +56,4 @@ services:
     restart: on-failure
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
\ No newline at end of file
+      - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner

From 83a9d3ff35455d4f0edadf83f43f322c4552e4f0 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 15 Mar 2019 09:58:42 -0400
Subject: [PATCH 19/39] Changed to Docker-in-Docker

---
 templates/GitLab-Runner/0/README.md          | 6 +++++-
 templates/GitLab-Runner/0/docker-compose.yml | 8 +++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/templates/GitLab-Runner/0/README.md b/templates/GitLab-Runner/0/README.md
index eaa71b8..1005fad 100644
--- a/templates/GitLab-Runner/0/README.md
+++ b/templates/GitLab-Runner/0/README.md
@@ -1 +1,5 @@
-# GitLab Runner
\ No newline at end of file
+# GitLab Runner
+
+## Technical Notes
+
+* Using "Docker-in-Docker" type of configuration, [Described Here](https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-in-docker-executor)
\ No newline at end of file
diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 6830137..04f3918 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -13,7 +13,8 @@ services:
       - --executor
       - "docker"
       - --docker-image
-      - alpine:latest
+      - docker:stable
+      - --docker-privileged
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
       - --description
       - ${GITLAB_RUNNER_DESCRIPTION}
@@ -36,7 +37,7 @@ services:
       {{- end}}
       traefik.enable: false
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      # - /var/run/docker.sock:/var/run/docker.sock
       - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
   gitlab-runner:
     image: gitlab/gitlab-runner:alpine
@@ -53,7 +54,8 @@ services:
       {{- end}}
       io.rancher.sidekicks: gitlab-runner-config
       traefik.enable: false
+    privileged: true # Required for Docker-in-Docker
     restart: on-failure
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      # - /var/run/docker.sock:/var/run/docker.sock
       - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner

From 01abb1b2128bedade092178f3c3081d851cc832b Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 15 Mar 2019 12:56:51 -0400
Subject: [PATCH 20/39] Changed to being off of alpine until I get my CI
 working

---
 templates/GitLab-Runner/0/docker-compose.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 04f3918..bb55035 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   gitlab-runner-config:
-    image: gitlab/gitlab-runner:alpine
+    image: gitlab/gitlab-runner:latest
     command:
       - register
       - --non-interactive
@@ -13,7 +13,7 @@ services:
       - --executor
       - "docker"
       - --docker-image
-      - docker:stable
+      - docker:latest
       - --docker-privileged
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
       - --description
@@ -37,10 +37,9 @@ services:
       {{- end}}
       traefik.enable: false
     volumes:
-      # - /var/run/docker.sock:/var/run/docker.sock
       - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
   gitlab-runner:
-    image: gitlab/gitlab-runner:alpine
+    image: gitlab/gitlab-runner:latest
     command:
       - run
     {{- if .Values.GITLAB_LINK}}
@@ -57,5 +56,4 @@ services:
     privileged: true # Required for Docker-in-Docker
     restart: on-failure
     volumes:
-      # - /var/run/docker.sock:/var/run/docker.sock
       - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner

From dc54f0e8b12563350d8630d4e92185319dc837e6 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 15 Mar 2019 13:38:49 -0400
Subject: [PATCH 21/39] Alpine should be fine

---
 templates/GitLab-Runner/0/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index bb55035..4a14996 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   gitlab-runner-config:
-    image: gitlab/gitlab-runner:latest
+    image: gitlab/gitlab-runner:alpine
     command:
       - register
       - --non-interactive
@@ -39,7 +39,7 @@ services:
     volumes:
       - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
   gitlab-runner:
-    image: gitlab/gitlab-runner:latest
+    image: gitlab/gitlab-runner:alpine
     command:
       - run
     {{- if .Values.GITLAB_LINK}}

From 0ea121af9588125ddaa7bcedfae9fcacf95d70bd Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 15 Mar 2019 13:40:07 -0400
Subject: [PATCH 22/39] Socket mount may be needed

---
 templates/GitLab-Runner/0/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 4a14996..553c6b3 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -37,6 +37,7 @@ services:
       {{- end}}
       traefik.enable: false
     volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
       - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
   gitlab-runner:
     image: gitlab/gitlab-runner:alpine
@@ -56,4 +57,5 @@ services:
     privileged: true # Required for Docker-in-Docker
     restart: on-failure
     volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
       - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner

From 68e772618a3cfc173c253f8d9f5f58603bfd3a8c Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 15 Mar 2019 13:42:38 -0400
Subject: [PATCH 23/39] Added note about using alpine runner

---
 templates/GitLab-Runner/0/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 553c6b3..11e9094 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   gitlab-runner-config:
-    image: gitlab/gitlab-runner:alpine
+    image: gitlab/gitlab-runner:alpine # Alpine Linux image is designed to use only Docker as the method of spawning runners
     command:
       - register
       - --non-interactive
@@ -40,7 +40,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
   gitlab-runner:
-    image: gitlab/gitlab-runner:alpine
+    image: gitlab/gitlab-runner:alpine # Alpine Linux image is designed to use only Docker as the method of spawning runners
     command:
       - run
     {{- if .Values.GITLAB_LINK}}

From acc305804e4586129cd0f7a00d5701b8eac4255f Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 15 Mar 2019 13:56:43 -0400
Subject: [PATCH 24/39] Unsure, don't want to claim something I don't know

---
 templates/GitLab-Runner/0/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 11e9094..4c652a5 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -54,7 +54,7 @@ services:
       {{- end}}
       io.rancher.sidekicks: gitlab-runner-config
       traefik.enable: false
-    privileged: true # Required for Docker-in-Docker
+    privileged: true
     restart: on-failure
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock

From 8056390777ccf204c1cdceb76fa459eb4a545bf2 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 15 Mar 2019 14:59:30 -0400
Subject: [PATCH 25/39] No reason why it shouldn't be running, therefore:
 restart: always

---
 templates/GitLab-Runner/0/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 4c652a5..df6c1b2 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -55,7 +55,7 @@ services:
       io.rancher.sidekicks: gitlab-runner-config
       traefik.enable: false
     privileged: true
-    restart: on-failure
+    restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner

From 3054573ed9499149321005d4af31de3d1700a670 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 3 May 2019 22:33:38 -0400
Subject: [PATCH 26/39] Removed unused variable; added test builds_dir

---
 templates/GitLab-Runner/0/docker-compose.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index df6c1b2..d09ed5a 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -14,7 +14,8 @@ services:
       - "docker"
       - --docker-image
       - docker:latest
-      - --docker-privileged
+      - --docker-builds_dir
+      - "/builds_test/"
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
       - --description
       - ${GITLAB_RUNNER_DESCRIPTION}

From 2037af22755201d66fe5353309a04ae5d56a2e16 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 3 May 2019 22:34:49 -0400
Subject: [PATCH 27/39] Removed untagged ability

---
 templates/GitLab-Runner/0/docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index d09ed5a..58b6996 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -24,7 +24,6 @@ services:
       - --tag-list
       - ${GITLAB_TAGS}
       {{- end}}
-      - --run-untagged
       - --locked=false
     {{- if .Values.GITLAB_LINK}}
     external_links:

From 24461adaa6ee40517c683d253b1804c04978f820 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 3 May 2019 22:36:14 -0400
Subject: [PATCH 28/39] Removed privileged declaration

---
 templates/GitLab-Runner/0/docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 58b6996..3903da7 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -54,7 +54,6 @@ services:
       {{- end}}
       io.rancher.sidekicks: gitlab-runner-config
       traefik.enable: false
-    privileged: true
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock

From 991b0efa95aa044f43440c92c2109da0d0d7a44d Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 3 May 2019 22:44:20 -0400
Subject: [PATCH 29/39] Fixed typo

---
 templates/GitLab-Runner/0/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 3903da7..464086d 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -12,10 +12,10 @@ services:
       - ${GITLAB_TOKEN}
       - --executor
       - "docker"
+      - --builds_dir
+      - "/builds_test/"
       - --docker-image
       - docker:latest
-      - --docker-builds_dir
-      - "/builds_test/"
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
       - --description
       - ${GITLAB_RUNNER_DESCRIPTION}

From 21376b3a324849da5aeec5dee292b3619a4e9043 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 3 May 2019 22:59:13 -0400
Subject: [PATCH 30/39] Just not playing well for some reason

---
 templates/GitLab-Runner/0/docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 464086d..545556f 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -12,8 +12,6 @@ services:
       - ${GITLAB_TOKEN}
       - --executor
       - "docker"
-      - --builds_dir
-      - "/builds_test/"
       - --docker-image
       - docker:latest
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}

From b73eb1b0211777a730f3cb7c4113a0d50cdc4407 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Sat, 4 May 2019 09:45:26 -0400
Subject: [PATCH 31/39] Found correct builds-dir tag, added back privileged
 declarations

---
 templates/GitLab-Runner/0/docker-compose.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 545556f..c3ec717 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -14,6 +14,9 @@ services:
       - "docker"
       - --docker-image
       - docker:latest
+      - --builds-dir
+      - "/test_dir/"
+      - --docker-privileged
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
       - --description
       - ${GITLAB_RUNNER_DESCRIPTION}
@@ -52,6 +55,7 @@ services:
       {{- end}}
       io.rancher.sidekicks: gitlab-runner-config
       traefik.enable: false
+    privileged: true
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock

From 8ae12b91d687729d17f8f5f8fd7539f691586701 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Sat, 4 May 2019 10:19:42 -0400
Subject: [PATCH 32/39] No need for changing builds-dir anymore

---
 templates/GitLab-Runner/0/docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index c3ec717..80f66a2 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -14,8 +14,6 @@ services:
       - "docker"
       - --docker-image
       - docker:latest
-      - --builds-dir
-      - "/test_dir/"
       - --docker-privileged
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
       - --description

From 6d29aa85c0e6c843874ea560cf80f9d015b8b6d0 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Sat, 4 May 2019 14:53:19 -0400
Subject: [PATCH 33/39] Added ability to add extra hosts for the runners

---
 templates/GitLab-Runner/0/docker-compose.yml  | 10 +++++++---
 templates/GitLab-Runner/0/rancher-compose.yml |  8 ++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 80f66a2..9862157 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -12,9 +12,6 @@ services:
       - ${GITLAB_TOKEN}
       - --executor
       - "docker"
-      - --docker-image
-      - docker:latest
-      - --docker-privileged
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
       - --description
       - ${GITLAB_RUNNER_DESCRIPTION}
@@ -24,6 +21,13 @@ services:
       - ${GITLAB_TAGS}
       {{- end}}
       - --locked=false
+      - --docker-image
+      - docker:latest
+      - --docker-privileged
+      {{- if .Values.GITLAB_IP}}
+      - --docker-extra-hosts
+      - ["gitlab:${GITLAB_IP}"]
+      {{- end}}
     {{- if .Values.GITLAB_LINK}}
     external_links:
       - ${GITLAB_LINK}{{- if .Values.GITLAB_LINK_ALIAS}}:${GITLAB_LINK_ALIAS}{{- end}}
diff --git a/templates/GitLab-Runner/0/rancher-compose.yml b/templates/GitLab-Runner/0/rancher-compose.yml
index be2c9f2..72f3f4b 100644
--- a/templates/GitLab-Runner/0/rancher-compose.yml
+++ b/templates/GitLab-Runner/0/rancher-compose.yml
@@ -66,6 +66,14 @@ catalog:
       required: false
       type: string
 
+    - variable: "GITLAB_IP"
+      label: "Local GitLab IP"
+      description: |
+        (Optional) The local IP address of the GitLab service.
+      # default: ""
+      required: false
+      type: string
+
     - variable: "DATA_DIR"
       label: "Data Directory"
       description: |

From 8c551fb483df25f6b10dccca676a96cf894fe74c Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Sat, 4 May 2019 14:53:47 -0400
Subject: [PATCH 34/39] Removed brackets, since I don't want to have an array

---
 templates/GitLab-Runner/0/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 9862157..710afba 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       - --docker-privileged
       {{- if .Values.GITLAB_IP}}
       - --docker-extra-hosts
-      - ["gitlab:${GITLAB_IP}"]
+      - "gitlab:${GITLAB_IP}"
       {{- end}}
     {{- if .Values.GITLAB_LINK}}
     external_links:

From 67a6039f8878dc41254e42aceb48d158bbb277ad Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Sat, 4 May 2019 14:57:13 -0400
Subject: [PATCH 35/39] Removed link alias to simplify

---
 templates/GitLab-Runner/0/docker-compose.yml  | 4 ++--
 templates/GitLab-Runner/0/rancher-compose.yml | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 710afba..2cbec0a 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -30,7 +30,7 @@ services:
       {{- end}}
     {{- if .Values.GITLAB_LINK}}
     external_links:
-      - ${GITLAB_LINK}{{- if .Values.GITLAB_LINK_ALIAS}}:${GITLAB_LINK_ALIAS}{{- end}}
+      - ${GITLAB_LINK}:gitlab
     {{- end}}
     labels:
       io.rancher.container.pull_image: always
@@ -48,7 +48,7 @@ services:
       - run
     {{- if .Values.GITLAB_LINK}}
     external_links:
-      - ${GITLAB_LINK}{{- if .Values.GITLAB_LINK_ALIAS}}:${GITLAB_LINK_ALIAS}{{- end}}
+      - ${GITLAB_LINK}:gitlab
     {{- end}}
     labels:
       io.rancher.container.pull_image: always
diff --git a/templates/GitLab-Runner/0/rancher-compose.yml b/templates/GitLab-Runner/0/rancher-compose.yml
index 72f3f4b..b1d6e51 100644
--- a/templates/GitLab-Runner/0/rancher-compose.yml
+++ b/templates/GitLab-Runner/0/rancher-compose.yml
@@ -58,14 +58,6 @@ catalog:
       required: false
       type: service
 
-    - variable: "GITLAB_LINK_ALIAS"
-      label: "GitLab Service Alias"
-      description: |
-        (Optional) Create an alias for the service.
-      default: "gitlab"
-      required: false
-      type: string
-
     - variable: "GITLAB_IP"
       label: "Local GitLab IP"
       description: |

From 6499c537f716c1a538cd5d9911c1df60dab43e45 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Fri, 10 May 2019 22:42:54 -0400
Subject: [PATCH 36/39] Set "/Rancher" as base data directory

---
 templates/GitLab-Runner/0/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 2cbec0a..a31c721 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -41,7 +41,7 @@ services:
       traefik.enable: false
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
+      - /Rancher/${DATA_DIR}:/etc/gitlab-runner
   gitlab-runner:
     image: gitlab/gitlab-runner:alpine # Alpine Linux image is designed to use only Docker as the method of spawning runners
     command:
@@ -61,4 +61,4 @@ services:
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
+      - /Rancher/${DATA_DIR}:/etc/gitlab-runner

From fde33c59d3f878e49fdc87c2c486296b38880bde Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Tue, 28 May 2019 18:54:19 -0400
Subject: [PATCH 37/39] Added apps here to remove the branches.

---
 Cool Stuff.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Cool Stuff.md b/Cool Stuff.md
index f1aa0fb..9693a13 100644
--- a/Cool Stuff.md	
+++ b/Cool Stuff.md	
@@ -28,7 +28,6 @@
 [http://sabre.io/baikal/]
 [https://radicale.org/]
 [https://www.xandikos.org/]
-
 [https://hub.docker.com/r/libreplan/libreplan/]
 [https://hub.docker.com/r/fjudith/draw.io]
 [https://hub.docker.com/r/linuxserver/openvpn-as]
@@ -47,6 +46,14 @@
 [https://getcockpit.com/]
 [https://hub.docker.com/r/agentejo/cockpit]
 [https://hub.docker.com/r/homeassistant/home-assistant]
+- Factorio
+- Eclipse Theia
+- Joomla
+- Matomo
+- MediaWiki
+- Mongo
+- Transmission
+- YOURLS
 
 ###### GitLab Runner
 

From 997580e4e9430a62bf0d5994b9442a3ad9014d35 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Sun, 2 Jun 2019 19:30:15 -0400
Subject: [PATCH 38/39] Added note to update Snipe-IT later

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

diff --git a/README.md b/README.md
index 2b97adb..1ab7435 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ Hopefully it can also be of use to others as well!
 * Have DATA_DIR be optional
 * Include logos for all stacks
 * Include descriptions and setup instructions for all stacks
+* Snipe-IT now has a simplified setup for Docker, so an update is needed there...
 
 ## Stack Completion Statuses
 

From 2050e3e7130ccf3f05861a767f946d083367e151 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Sun, 9 Jun 2019 15:35:12 -0400
Subject: [PATCH 39/39] Removed :rw tags, as they did not fix the issue; added
 /var/www/user mount directory

---
 templates/Grav/0/docker-compose.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/Grav/0/docker-compose.yml b/templates/Grav/0/docker-compose.yml
index 0195a5e..eab91e8 100644
--- a/templates/Grav/0/docker-compose.yml
+++ b/templates/Grav/0/docker-compose.yml
@@ -27,5 +27,6 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
       - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
-      - /Rancher/${DATA_DIR}/Backups:/var/www/backup:rw # Backups
-      - /Rancher/${DATA_DIR}/Images:/var/www/images:rw # Images
\ No newline at end of file
+      - /Rancher/${DATA_DIR}/Backups:/var/www/backup # Backups
+      - /Rancher/${DATA_DIR}/Images:/var/www/images # Images
+      - /Rancher/${DATA_DIR}/User:/var/www/user # User Data
\ No newline at end of file