feat(update): minor changes

docker-compose.yml

@@ -10,9 +10,9 @@ services:
     hostname: "${GITLAB_HOST}"
     environment:
       - TZ=${TZ}
-      - VIRTUAL_HOST=${GITLAB_HOST},${REGISTRY_HOST},${PAGES_HOST}
+      - VIRTUAL_HOST=${GITLAB_HOST},${REGISTRY_HOST}
       - VIRTUAL_PORT=80
-      - LETSENCRYPT_HOST=${GITLAB_HOST},${REGISTRY_HOST},${PAGES_HOST}
+      - LETSENCRYPT_HOST=${GITLAB_HOST},${REGISTRY_HOST}
       - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
     ports:
       - ${GITLAB_SSH_IP}:${GITLAB_SSH_PORT}:22
@@ -27,6 +27,35 @@ services:
       - default
       - nginx_proxy
 
+  pages:
+    image: gitlab/gitlab-ce:${GITLAB_CE_VERSION}
+    restart: always
+    container_name: gitlab_pages
+    hostname: "${PAGES_HOST}"
+    environment:
+      - TZ=${TZ}
+      - VIRTUAL_HOST=${PAGES_HOST},*.${PAGES_HOST}
+      - VIRTUAL_PORT=8090
+      - HTTPS_METHOD=nohttps
+      # - LETSENCRYPT_HOST=${PAGES_HOST}
+      # - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
+    expose:
+      - 8090/tcp
+    entrypoint:
+      - /opt/gitlab/embedded/bin/gitlab-pages
+    command:
+      - -listen-proxy
+      - "0.0.0.0:8090"
+      - -pages-domain
+      - "${PAGES_HOST}"
+      - -pages-root
+      - "/var/opt/gitlab/gitlab-rails/shared/pages"
+    volumes:
+      - './volumes/data/gitlab-pages:/var/opt/gitlab/gitlab-pages:rw'
+      - './volumes/data/gitlab-rails/shared/pages:/var/opt/gitlab/gitlab-rails/shared/pages:ro'
+    networks:
+      - nginx_proxy
+
   runner:
     image: gitlab/gitlab-runner:${GITLAB_RUNNER_VERSION}
     restart: always

templates/gitlab.rb

@@ -12,8 +12,8 @@
 ##! https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab
 external_url 'https://${GITLAB_HOST}'
 registry_external_url 'https://${REGISTRY_HOST}'
-pages_external_url 'https://${PAGES_HOST}'
-
+pages_external_url 'http://${PAGES_HOST}'
+ 
 ### Trusted proxies
 ###! Customize if you have GitLab behind a reverse proxy which is running on a
 ###! different machine.
@@ -48,7 +48,7 @@ gitlab_rails['smtp_tls'] = true
 gitlab_rails['gitlab_email_from'] = 'gitlab@${GITLAB_SMTP_DOMAIN}'
 gitlab_rails['gitlab_email_reply_to'] = 'noreply@${GITLAB_SMTP_DOMAIN}'
 
-gitlab_pages['enable'] = true
+alertmanager['listen_address'] = 'localhost:9093'
 
 ################################################################
 ## GitLab PostgreSQL
@@ -85,3 +85,11 @@ nginx['listen_https'] = false
 registry_nginx['listen_https'] = false
 pages_nginx['listen_https'] = false
 
+################################################################################
+## GitLab Pages
+##! Docs: https://docs.gitlab.com/ce/pages/administration.html
+################################################################################
+
+gitlab_pages['enable'] = true
+gitlab_pages['inplace_chroot'] = true
+gitlab_pages['listen_proxy'] = "0.0.0.0:8090"