diff --git a/fighter/config/gitlab/.env b/fighter/config/gitlab/.env index 414464b..7792fb4 100644 --- a/fighter/config/gitlab/.env +++ b/fighter/config/gitlab/.env @@ -1,2 +1,2 @@ DOCKER_DATA=/home/admin/data/gitlab -DOCKER_CONFIG=/home/admin/docker_config/gitlab \ No newline at end of file +DOCKER_CONFIG=/home/admin/docker_config/gitlab diff --git a/fighter/config/gitlab/docker-compose.yml b/fighter/config/gitlab/docker-compose.yml index 5ee88f8..c9dfe44 100644 --- a/fighter/config/gitlab/docker-compose.yml +++ b/fighter/config/gitlab/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: gitlab: - image: 'gitlab/gitlab-ee:latest' + image: 'gitlab/gitlab-ee:16.4.1-ee.0' container_name: gitlab_gitlab deploy: resources: @@ -13,6 +13,7 @@ services: - web - gitlab environment: + GITLAB_SKIP_UNMIGRATED_DATA_CHECK: "true" GITLAB_OMNIBUS_CONFIG: | external_url 'https://gitlab.jafner.net' gitlab_rails['gitlab_shell_ssh_port'] = 2229 @@ -31,7 +32,6 @@ services: gitlab_rails['smtp_password'] = "kvdunrhjsqbslson" gitlab_rails['smtp_domain'] = "jafner.net" gitlab_rails['smtp_authentication'] = "login" - gitlab_rails['smtp_enable_starttls_auto'] = true gitlab_rails['smtp_openssl_verify_mode'] = 'peer' gitlab_rails['gitlab_email_from'] = 'gitlab@jafner.net' gitlab_rails['gitlab_email_reply_to'] = 'noreply@jafner.net' @@ -121,4 +121,4 @@ services: networks: web: external: true - gitlab: \ No newline at end of file + gitlab: diff --git a/fighter/config/plex/plex_stack.env b/fighter/config/plex/plex_stack.env index 248f7ce..4279318 100644 --- a/fighter/config/plex/plex_stack.env +++ b/fighter/config/plex/plex_stack.env @@ -1,3 +1,3 @@ -PUID=1000 -PGID=1000 -TZ=America/Los_Angeles \ No newline at end of file +PUID=1001 +PGID=1001 +TZ=America/Los_Angeles