Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Gitlab
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
NoCloud
docker
Gitlab
Commits
ac746190
Commit
ac746190
authored
1 year ago
by
Elian Loraux
Browse files
Options
Downloads
Patches
Plain Diff
Move all variable un docker-compose to .env
parent
5d5226cc
No related branches found
No related tags found
1 merge request
!1
Separate all variable
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.env.sample
+8
-0
8 additions, 0 deletions
.env.sample
.gitignore
+0
-1
0 additions, 1 deletion
.gitignore
docker-compose.yml
+17
-18
17 additions, 18 deletions
docker-compose.yml
with
25 additions
and
19 deletions
.env.sample
+
8
−
0
View file @
ac746190
COMPOSE_FILE=docker-compose.yml:traefik.yml
HOST=gitlab.societe-informatique-de-france.fr
HOST=gitlab.societe-informatique-de-france.fr
TZ=Europe/Paris
TZ=Europe/Paris
#EMAIL
GITLAB_MAIL=gitlab@societe-informatique-de-france.fr
SMTP_ADRESS=ssl0.ovh.net
SMTP_PASS=GITLAB_MAIL_SECRET_PASSWORD
SMTP_DOMAINE=societe-informatique-de-france.fr
This diff is collapsed.
Click to expand it.
.gitignore
+
0
−
1
View file @
ac746190
/docker-compose.yml
.env
.env
runner/.env
runner/.env
This diff is collapsed.
Click to expand it.
docker-compose.yml
.sample
→
docker-compose.yml
+
17
−
18
View file @
ac746190
...
@@ -4,15 +4,14 @@ services:
...
@@ -4,15 +4,14 @@ services:
gitlab
:
gitlab
:
image
:
'
gitlab/gitlab-ce:16.8.1-ce.0'
image
:
'
gitlab/gitlab-ce:16.8.1-ce.0'
restart
:
always
restart
:
always
hostname: '
gitlab.FQDN
'
hostname
:
'
${HOST}
'
networks
:
networks
:
- ldap
-
traefik
-
traefik
environment
:
environment
:
TZ
:
TZ
:
GITLAB_OMNIBUS_CONFIG
:
|
GITLAB_OMNIBUS_CONFIG
:
|
gitlab_rails['gitlab_shell_ssh_port'] = 2222
gitlab_rails['gitlab_shell_ssh_port'] = 2222
external_url = 'https://
gitlab.FQDN
'
external_url = 'https://
${HOST}
'
nginx['listen_port'] = 80
nginx['listen_port'] = 80
nginx['listen_https'] = false
nginx['listen_https'] = false
nginx['proxy_set_headers'] = {
nginx['proxy_set_headers'] = {
...
@@ -21,7 +20,7 @@ services:
...
@@ -21,7 +20,7 @@ services:
}
}
nginx['redirect_http_to_https'] = true
nginx['redirect_http_to_https'] = true
nginx['redirect_http_to_https_port'] = 80
nginx['redirect_http_to_https_port'] = 80
gitlab_rails['allowed_hosts'] = ['
gitlab.FQDN
', 'localhost', '127.0.0.1', 'gitlab']
gitlab_rails['allowed_hosts'] = ['
${HOST}
', 'localhost', '127.0.0.1', 'gitlab']
# Each address is added to the the NGINX config as 'set_real_ip_from <address>;'
# Each address is added to the the NGINX config as 'set_real_ip_from <address>;'
# TODO replace the 172.19.0.6 ip by traefik's one
# TODO replace the 172.19.0.6 ip by traefik's one
nginx['real_ip_trusted_addresses'] = [ '172.19.0.2' ]
nginx['real_ip_trusted_addresses'] = [ '172.19.0.2' ]
...
@@ -41,35 +40,35 @@ services:
...
@@ -41,35 +40,35 @@ services:
}
}
# Mail
# Mail
gitlab_rails['smtp_enable'] = true
gitlab_rails['smtp_enable'] = true
gitlab_rails['smtp_address'] = "
changeme
"
gitlab_rails['smtp_address'] = "
${SMTP_ADRESS}
"
gitlab_rails['smtp_port'] = 465
gitlab_rails['smtp_port'] = 465
gitlab_rails['smtp_user_name'] = "
changeme@FQDN
"
gitlab_rails['smtp_user_name'] = "
${GITLAB_MAIL}
"
gitlab_rails['smtp_password'] = "
changeme
"
gitlab_rails['smtp_password'] = "
${SMTP_PASS}
"
gitlab_rails['smtp_domain'] = "
changeme
"
gitlab_rails['smtp_domain'] = "
${SMTP_DOMAINE}
"
gitlab_rails['smtp_authentication'] = "login"
gitlab_rails['smtp_authentication'] = "login"
gitlab_rails['smtp_enable_starttls_auto'] = false
gitlab_rails['smtp_enable_starttls_auto'] = false
gitlab_rails['smtp_tls'] = true
gitlab_rails['smtp_tls'] = true
gitlab_rails['smtp_openssl_verify_mode'] = 'peer'
gitlab_rails['smtp_openssl_verify_mode'] = 'peer'
# If your SMTP server does not like the default 'From: gitlab@localhost' you
# If your SMTP server does not like the default 'From: gitlab@localhost' you
# # can change the 'From' with this setting.
# # can change the 'From' with this setting.
gitlab_rails['gitlab_email_from'] = '
changeme@FQDN
'
gitlab_rails['gitlab_email_from'] = '
${GITLAB_MAIL}
'
# gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com'
# gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com'
gitlab_rails['incoming_email_enabled'] = true
gitlab_rails['incoming_email_enabled'] = true
# The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to.
# The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to.
# The placeholder can be omitted but if present, it must appear in the "user" part of the address (before the `@`).
# The placeholder can be omitted but if present, it must appear in the "user" part of the address (before the `@`).
gitlab_rails['incoming_email_address'] = "
changeme+%{key}@FQDN
"
gitlab_rails['incoming_email_address'] = "
${GITLAB_MAIL}
"
# Email account username
# Email account username
# With third party providers, this is usually the full email address.
# With third party providers, this is usually the full email address.
# With self-hosted email servers, this is usually the user part of the email address.
# With self-hosted email servers, this is usually the user part of the email address.
gitlab_rails['incoming_email_email'] = "
changeme@FDQN
"
gitlab_rails['incoming_email_email'] = "
${GITLAB_MAIL}
"
# Email account password
# Email account password
gitlab_rails['incoming_email_password'] = "
changeme
"
gitlab_rails['incoming_email_password'] = "
${SMTP_PASS}
"
# IMAP server host
# IMAP server host
gitlab_rails['incoming_email_host'] = "
changeme
"
gitlab_rails['incoming_email_host'] = "
${SMTP_ADRESS}
"
# IMAP server port
# IMAP server port
gitlab_rails['incoming_email_port'] = 993
gitlab_rails['incoming_email_port'] = 993
# Whether the IMAP server uses SSL
# Whether the IMAP server uses SSL
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment