Compare commits

..
Author SHA1 Message Date
marlon 09fde93cdf chore: publish 0.1.6+17.11.7-ce.0 release 2025-08-24 15:55:59 -04:00
6 changed files with 24 additions and 56 deletions
+1 -14
View File
@@ -18,10 +18,6 @@ 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_VERSION=v1
GITLAB_CONF_VERSION=v1
ENTRYPOINT_VERSION=v1
SSO=false
## Authentik Configuration
@@ -29,13 +25,4 @@ 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
## 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
# SECRET_SSO_PROVIDER_SECRET_VERSION=v1
+2 -2
View File
@@ -1,6 +1,6 @@
#!/bin/bash
export GITLAB_CONF_VERSION=v1
export ENTRYPOINT_VERSION=v1
GITLAB_CONF_VERSION=v1
ENTRYPOINT_VERSION=v1
run_rails_command() {
su -p root -s /bin/sh -c "gitlab-rails runner '$@'"
+2 -6
View File
@@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: 'gitlab/gitlab-ce:18.10.4-ce.0'
image: 'gitlab/gitlab-ce:17.11.7-ce.0'
networks:
- proxy
- internal
@@ -34,12 +34,11 @@ 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.3+18.10.4-ce.0"
- "coop-cloud.${STACK_NAME}.version=0.1.6+17.11.7-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
@@ -51,9 +50,6 @@ 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}
+19 -19
View File
@@ -82,16 +82,15 @@ external_url 'https://{{ env "DOMAIN" }}'
###! Docs: https://docs.gitlab.com/omnibus/settings/smtp.html
###! **Use smtp instead of sendmail/postfix.**
gitlab_rails['smtp_enable'] = {{ env "SMTP_ENABLE_FLAG" }}
gitlab_rails['smtp_address'] = "{{ env "SMTP_HOST" }}"
gitlab_rails['smtp_port'] = {{ env "SMTP_PORT" }}
gitlab_rails['smtp_user_name'] = "{{ env "SMTP_USER" }}"
gitlab_rails['smtp_password'] = "{{ secret "smtp_password" }}"
gitlab_rails['smtp_domain'] = "{{ env "SMTP_DOMAIN" }}"
gitlab_rails['smtp_authentication'] = "login"
gitlab_rails['smtp_enable_starttls_auto'] = true
gitlab_rails['smtp_tls'] = false
# gitlab_rails['smtp_enable'] = true
# gitlab_rails['smtp_address'] = "smtp.server"
# gitlab_rails['smtp_port'] = 465
# gitlab_rails['smtp_user_name'] = "smtp user"
# gitlab_rails['smtp_password'] = "smtp password"
# gitlab_rails['smtp_domain'] = "example.com"
# gitlab_rails['smtp_authentication'] = "login"
# gitlab_rails['smtp_enable_starttls_auto'] = true
# gitlab_rails['smtp_tls'] = false
# gitlab_rails['smtp_pool'] = false
###! **Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'**
@@ -2292,23 +2291,24 @@ registry_nginx['listen_https'] = false
# grafana['metrics_basic_auth_password'] = 'please_set_a_unique_password' # default: nil
# grafana['alerting_enabled'] = false
### SMTP Configuration
### SMTP Configuration
#
# See: http://docs.grafana.org/administration/configuration/#smtp
#
# grafana['smtp'] = {
# 'enabled' => {{ env "SMTP_ENABLE_FLAG" }},
# 'host' => '{{ env "SMTP_HOST" }}:{{ env "SMTP_PORT" }}',
# 'user' => {{ env "SMTP_USER" }},
# 'password' => {{ secret "smtp_password" }},
# 'enabled' => true,
# 'host' => 'localhost:25',
# 'user' => nil,
# 'password' => nil,
# 'cert_file' => nil,
# 'key_file' => nil,
# 'skip_verify' => false,
# 'from_address' => '{{ env "SMTP_FROM_ADDRESS" }}',
# 'from_name' => '{{ env "SMTP_FROM_NAME" }}',
# 'ehlo_identity' => '{{ env "SMTP_EHLO" }}',
# 'startTLS_policy' => {{ env "SMTP_STARTTLS_FLAG" }}
# 'from_address' => 'admin@grafana.localhost',
# 'from_name' => 'Grafana',
# 'ehlo_identity' => 'dashboard.example.com',
# 'startTLS_policy' => nil
# }
# Grafana usage reporting defaults to gitlab_rails['usage_ping_enabled']
# grafana['reporting_enabled'] = true
-1
View File
@@ -1 +0,0 @@
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/
-14
View File
@@ -1,14 +0,0 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"packageRules": [
{
"matchDatasources": [
"docker"
],
"pinDigests": true
}
]
}