From 9ba697f06ebd3444fef2cf3b3d5516c8b60ef4c6 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Tue, 1 Mar 2022 21:36:44 -0800
Subject: [PATCH] Add Gitlab container registry config and docs
---
server/config/gitlab/README.md | 10 ++++++++++
server/config/gitlab/docker-compose.yml | 2 ++
2 files changed, 12 insertions(+)
create mode 100644 server/config/gitlab/README.md
diff --git a/server/config/gitlab/README.md b/server/config/gitlab/README.md
new file mode 100644
index 0000000..14d5ebd
--- /dev/null
+++ b/server/config/gitlab/README.md
@@ -0,0 +1,10 @@
+# Updating GitLab configuration
+This gitlab instance is using the omnibus package.
+See [GitLab Omnibus Reconfigure](https://docs.gitlab.com/ee/administration/restart_gitlab.html#omnibus-gitlab-reconfigure) for official docs on reconfiguration.
+Here are the basic steps:
+1. Update the `GITLAB_OMNIBUS_CONFIG` environment variable in `docker-compose.yml`. Add the desired omnibus configuration lines.
+2. Run `docker exec -it gitlab /bin/bash` to enter the container.
+3. Run `vi /etc/gitlab/gitlab.rb` to begin editing the config file. Make the necessary changes (`i` to enter insert mode), then save (`esc`, then `:wq`, enter).
+4. Run `gitlab-ctl diff-config` to compare the new config file with the *default* config file (not previous).
+5. Run `gitlab-ctl reconfigure` to apply the changes.
+6. Confirm the value set in step 1 is still correct.
diff --git a/server/config/gitlab/docker-compose.yml b/server/config/gitlab/docker-compose.yml
index dd8efc4..980b2aa 100644
--- a/server/config/gitlab/docker-compose.yml
+++ b/server/config/gitlab/docker-compose.yml
@@ -10,6 +10,7 @@ services:
environment:
GITLAB_OMNIBUS_CONFIG: |
external_url 'https://gitlab.jafner.net'
+ registry_external_url 'https://gitlab.jafner.net:5050'
gitlab_rails['gitlab_shell_ssh_port'] = 2229
nginx['listen_https'] = false
nginx['listen_port'] = 80
@@ -18,6 +19,7 @@ services:
#- '80:80'
#- '443:443'
- '2229:22'
+ - '5050:5050'
volumes:
- '${DOCKER_DATA}/config:/etc/gitlab'
- '${DOCKER_DATA}/logs:/var/log/gitlab'