Change tag for version 18.4.0-ce

Reviewed-on: #6

.env.sample

@@ -18,13 +18,24 @@ LETS_ENCRYPT_ENV=production
 GITLAB_ROOT_EMAIL="gitlab_admin@example.com"
 SECRET_INITIAL_ROOT_PASSWORD_VERSION=v1
 SECRET_RUNNER_TOKEN_VERSION=v1
-SECRET_REGISTRATION_TOKEN_VERSION=v1
+SECRET_SMTP_PASSWORD=v1
+
+GITLAB_CONF_VERSION=v1
+ENTRYPOINT_VERSION=v1
 
 SSO=false
 ## Authentik Configuration
-
 # SSO=true
 # 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,8 +1,6 @@
 #!/bin/bash
-GITLAB_CONF_VERSION=v1
-ENTRYPOINT_VERSION=v1
-RUNNER_ENTRYPOINT_VERSION=v1
-RUNNER_CONF_VERSION=v1
+export GITLAB_CONF_VERSION=v1
+export ENTRYPOINT_VERSION=v1
 
 run_rails_command() {
     su -p root -s /bin/sh -c "gitlab-rails runner '$@'"
@@ -30,10 +28,4 @@ disable_signups() {
 enable_signups () {
     run_rails_command 'Gitlab::CurrentSettings.update!(signup_enabled: true)'
     reconfigure
-}
-
-register_runner() {
-    RUNNER_TOKEN="$1"
-
-    gitlab-runner register --non-interactive --url "https://$CI_SERVER_URL" --token "$RUNNER_TOKEN" --executor "docker"
 }

compose.runner.yml

@@ -1,83 +0,0 @@
----
-version: "3.8"
-
-services:
-  runner:
-    image: registry.gitlab.com/gitlab-org/gitlab-runner:alpine
-    depends_on:
-      - dind
-    environment:
-      - CI_SERVER_URL=${DOMAIN}
-      - DOCKER_HOST=tcp://socket-proxy:2375
-      - RUNNER_TIMEOUT
-      - RUNNER_CONCURENCY
-    configs:
-      - source: runner_conf
-        target: /etc/gitlab-runner/config.toml
-      - source: entrypoint
-        target: /custom-entrypoint.sh
-        mode: 0555
-    volumes:
-      - "runnner_config:/etc/gitlab-runner"
-    networks:
-      - internal
-    deploy:
-      restart_policy:
-        condition: on-failure
-    entrypoint: /custom-entrypoint.sh
-
-  socket-proxy:
-    image: lscr.io/linuxserver/socket-proxy:3.2.6
-    environment:
-      - PROXY_READ_TIMEOUT=5000
-      - ALLOW_START=1
-      - ALLOW_STOP=1
-      - ALLOW_RESTARTS=1
-      - AUTH=1
-      - BUILD=1
-      - COMMIT=1
-      - CONFIGS=1
-      - CONTAINERS=1
-      - DISABLE_IPV6=0
-      - DISTRIBUTION=0
-      - EVENTS=1
-      - EXEC=1
-      - IMAGES=1
-      - INFO=1
-      - NETWORKS=1
-      - NODES=1
-      - PING=1
-      - POST=1
-      - PLUGINS=1
-      - SECRETS=1
-      - SERVICES=1
-      - SESSION=1
-      - SWARM=1
-      - SYSTEM=1
-      - TASKS=1
-      - VERSION=1
-      - VOLUMES=1
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    networks:
-      - internal
-    ports:
-      - "2375:2375"
-
-volumes:
-  runnner_config:
-
-secrets:
-  registration_token:
-    name: ${STACK_NAME}_registration_token_${SECRET_REGISTRATION_TOKEN_VERSION}
-    external: true
-
-configs:
-  runner_conf:
-    name: ${STACK_NAME}_runner_config_${RUNNER_CONF_VERSION}
-    file: runner-config.toml.tmpl
-    template_driver: golang
-  entrypoint:
-    name: ${STACK_NAME}_runner_entrypoint_${RUNNER_ENTRYPOINT_VERSION}
-    file: runner-entrypoint.sh.tmpl
-    template_driver: golang

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: 'gitlab/gitlab-ce:18.3.0-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.2.2+18.3.0-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}

gitlab.rb.tmpl

@@ -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']

renovate.json

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

runner-entrypoint.sh.tmpl

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-while [ ! -s /etc/gitlab-runner/config.toml ]
-do
-  echo "The runner was not registered yet. Next try in 5 seconds."
-  sleep 5
-done
-