Change tag for version 18.4.0-ce

Reviewed-on: #6

.env.sample

@@ -18,6 +18,10 @@ LETS_ENCRYPT_ENV=production
 GITLAB_ROOT_EMAIL="gitlab_admin@example.com"
 SECRET_INITIAL_ROOT_PASSWORD_VERSION=v1
 SECRET_RUNNER_TOKEN_VERSION=v1
+SECRET_SMTP_PASSWORD=v1
+
+GITLAB_CONF_VERSION=v1
+ENTRYPOINT_VERSION=v1
 
 SSO=false
 ## Authentik Configuration
@@ -25,4 +29,13 @@ SSO=false
 # ORG_NAME="My Organization"
 # SSO_PROVIDER_URL="https://authentik.mydomain.com/application/o/gitlab/"
 # SSO_PROVIDER_ID="your authentik Client ID"
-# SECRET_SSO_PROVIDER_SECRET_VERSION=v1
+# SECRET_SSO_PROVIDER_SECRET_VERSION=v1
+
+## Enable SMTP sending
+#SMTP_ENABLE_FLAG=true
+#SMTP_HOST=smtp.server.com
+#SMTP_PORT=465
+#SMTP_USER=your@user.com
+#SMTP_HOST_FROM_ADDRESS=your@user.com
+#SMTP_FROM_NAME="Gitlab"
+#SMTP_STARTTLS_FLAG=true

abra.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-GITLAB_CONF_VERSION=v1
-ENTRYPOINT_VERSION=v1
+export GITLAB_CONF_VERSION=v1
+export ENTRYPOINT_VERSION=v1
 
 run_rails_command() {
     su -p root -s /bin/sh -c "gitlab-rails runner '$@'"

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: 'gitlab/gitlab-ce:17.7.3-ce.0'
+    image: 'gitlab/gitlab-ce:18.10.4-ce.0'
     networks:
       - proxy
       - internal
@@ -34,11 +34,12 @@ services:
         - "backupbot.backup=true"
         - "backupbot.backup.path=/etc/gitlab/,/var/log/gitlab/,/var/opt/gitlab/"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-240}"
-        - "coop-cloud.${STACK_NAME}.version=0.1.2+17.7.3-ce.0"
+        - "coop-cloud.${STACK_NAME}.version=0.2.3+18.10.4-ce.0"
     secrets:
       - initial_root_password
       - runner_token
       - sso_provider_secret
+      - smtp_password
     healthcheck:
       test: ["CMD", "bash", "/opt/gitlab/etc/gitlab-healthcheck-rc" ]
       interval: 30s
@@ -50,6 +51,9 @@ secrets:
   initial_root_password:
     external: true
     name: ${STACK_NAME}_initial_root_password_${SECRET_INITIAL_ROOT_PASSWORD_VERSION}
+  smtp_password:
+    external: true
+    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
   runner_token:
     external: true
     name: ${STACK_NAME}_runner_token_${SECRET_RUNNER_TOKEN_VERSION}

entrypoint.sh.tmpl

@@ -6,4 +6,4 @@ echo "Copying custom Gitlab config to /etc/gitlab/"
 cp /gitlab.rb /etc/gitlab/gitlab.rb
 
 echo "Entrypoint finished, launching Gitlab"
-exec "/assets/wrapper"
+exec "/assets/init-container"

gitlab.rb.tmpl

@@ -678,7 +678,7 @@ gitlab_rails['omniauth_providers'] = [
 # high_availability['mountpoint'] = ["/var/opt/gitlab/git-data", "/var/opt/gitlab/gitlab-rails/shared"]
 
 ### GitLab Shell settings for GitLab
-# gitlab_rails['gitlab_shell_ssh_port'] = 22
+gitlab_rails['gitlab_shell_ssh_port'] = {{ env "GITLAB_SSH_PORT" }}
 # gitlab_rails['gitlab_shell_git_timeout'] = 800
 
 ### Enable gitlab-sshd on a different port than OpenSSH
@@ -2296,17 +2296,17 @@ registry_nginx['listen_https'] = false
 # See: http://docs.grafana.org/administration/configuration/#smtp
 #
 # grafana['smtp'] = {
-#   'enabled' => true,
-#   'host' => 'localhost:25',
-#   'user' => nil,
-#   'password' => nil,
+#   'enabled' => {{ env "SMTP_ENABLE_FLAG" }},
+#   'host' => '{{ env "SMTP_HOST" }}:{{ env "SMTP_PORT" }}',
+#   'user' => {{ env "SMTP_USER" }},
+#   'password' => {{ secret "smtp_password" }},
 #   'cert_file' => nil,
 #   'key_file' => nil,
 #   'skip_verify' => false,
-#   'from_address' => 'admin@grafana.localhost',
-#   'from_name' => 'Grafana',
-#   'ehlo_identity' => 'dashboard.example.com',
-#   'startTLS_policy' => nil
+#   'from_address' => '{{ env "SMTP_FROM_ADDRESS" }}',
+#   'from_name' => '{{ env "SMTP_FROM_NAME" }}',
+#   'ehlo_identity' => '{{ env "SMTP_EHLO" }}',
+#   'startTLS_policy' => {{ env "SMTP_STARTTLS_FLAG" }}
 # }
 
 # Grafana usage reporting defaults to gitlab_rails['usage_ping_enabled']

release/0.1.3+17.7.3-ce.0

@@ -0,0 +1 @@
+Fixes bug where GITLAB_SSH_PORT was not set in the Gitlab config

release/0.2.0+18.2.4-ce.0

@@ -0,0 +1 @@
+Starting with 18.0, GitLab will collect event-level product usage data from Self-Managed and Dedicated instances — while ensuring privacy, transparency, and customer control. GitLab administrators can turn off the data collection toggle before any data is collected in version 18.0. For more information about this change and how you can opt out, see the documentation: https://docs.gitlab.com/17.11/administration/settings/event_data/

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}