Skip to content

Commit 3628752

Browse files
tiangolosolidnerd
tiangolo
authored and
solidnerd
committed
🔧 Simplify Docker Compose Swarm file and fix labels
1 parent 408ea27 commit 3628752

File tree

1 file changed

+135
-135
lines changed

1 file changed

+135
-135
lines changed

‎docker-compose.swarm.yml‎

Lines changed: 135 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ services:
3333
- registry-data:/registry
3434
- certs-data:/certs
3535
environment:
36-
- REGISTRY_LOG_LEVEL=${REGISTRY_LOG_LEVEL:-info}
37-
- REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=${REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY:-/registry}
36+
- REGISTRY_LOG_LEVEL=info
37+
- REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/registry
3838
- REGISTRY_AUTH_TOKEN_REALM=https://${GITLAB_HOST?Variable not set}/jwt/auth
39-
- REGISTRY_AUTH_TOKEN_SERVICE=${REGISTRY_AUTH_TOKEN_SERVICE:-container_registry}
40-
- REGISTRY_AUTH_TOKEN_ISSUER=${REGISTRY_AUTH_TOKEN_ISSUER:-gitlab-issuer}
41-
- REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=${REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE:-/certs/registry.crt}
42-
- REGISTRY_STORAGE_DELETE_ENABLED=${REGISTRY_STORAGE_DELETE_ENABLED:-true}
39+
- REGISTRY_AUTH_TOKEN_SERVICE=container_registry
40+
- REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer
41+
- REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry.crt
42+
- REGISTRY_STORAGE_DELETE_ENABLED=true
4343
deploy:
4444
placement:
4545
constraints:
@@ -63,7 +63,7 @@ services:
6363
- traefik-public
6464

6565
gitlab:
66-
image: sameersbn/gitlab:13.0.0
66+
image: sameersbn/gitlab:13.0.0x
6767
depends_on:
6868
- redis
6969
- postgresql
@@ -84,134 +84,134 @@ services:
8484
environment:
8585
- DEBUG=false
8686

87-
- GITLAB_REGISTRY_ENABLED=${GITLAB_REGISTRY_ENABLED:-true}
87+
- GITLAB_REGISTRY_ENABLED=true
8888
- GITLAB_REGISTRY_HOST=${REGISTRY_HOST?Variable not set}
89-
- GITLAB_REGISTRY_PORT=${GITLAB_REGISTRY_PORT:-443}
90-
- GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://registry:5000}
91-
- GITLAB_REGISTRY_KEY_PATH=${GITLAB_REGISTRY_KEY_PATH:-/certs/registry.key}
92-
- GITLAB_REGISTRY_ISSUER=${GITLAB_REGISTRY_ISSUER:-gitlab-issuer}
93-
- GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=${GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES:-true}
89+
- GITLAB_REGISTRY_PORT=443
90+
- GITLAB_REGISTRY_API_URL=http://registry:5000
91+
- GITLAB_REGISTRY_KEY_PATH=/certs/registry.key
92+
- GITLAB_REGISTRY_ISSUER=gitlab-issuer
93+
- GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=true
9494

95-
- GITLAB_SIGNUP_ENABLED=${GITLAB_SIGNUP_ENABLED:-false}
95+
- GITLAB_SIGNUP_ENABLED=false
9696

97-
- DB_ADAPTER=${DB_ADAPTER:-postgresql}
98-
- DB_HOST=${DB_HOST:-postgresql}
99-
- DB_PORT=${DB_PORT:-5432}
100-
- DB_USER=${DB_USER:-gitlab}
101-
- DB_PASS=${DB_PASS:-password}
102-
- DB_NAME=${DB_NAME:-gitlabhq_production}
97+
- DB_ADAPTER=postgresql
98+
- DB_HOST=postgresql
99+
- DB_PORT=5432
100+
- DB_USER=gitlab
101+
- DB_PASS=password
102+
- DB_NAME=gitlabhq_production
103103

104-
- REDIS_HOST=${REDIS_HOST:-redis}
105-
- REDIS_PORT=${REDIS_PORT:-6379}
104+
- REDIS_HOST=redis
105+
- REDIS_PORT=6379
106106

107-
- TZ=${TZ:-Asia/Kolkata}
108-
- GITLAB_TIMEZONE=${GITLAB_TIMEZONE:-Kolkata}
107+
- TZ=Asia/Kolkata
108+
- GITLAB_TIMEZONE=Kolkata
109109

110-
- GITLAB_HTTPS=${GITLAB_HTTPS:-true}
111-
- SSL_SELF_SIGNED=${SSL_SELF_SIGNED:-false}
110+
- GITLAB_HTTPS=true
111+
- SSL_SELF_SIGNED=false
112112

113113
- GITLAB_HOST=${GITLAB_HOST?Variable not set}
114-
- GITLAB_PORT=${GITLAB_PORT:-443}
115-
- GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-22}
116-
- GITLAB_RELATIVE_URL_ROOT=${GITLAB_RELATIVE_URL_ROOT}
117-
- GITLAB_SECRETS_DB_KEY_BASE=${GITLAB_SECRETS_DB_KEY_BASE?Variable not set}
118-
- GITLAB_SECRETS_SECRET_KEY_BASE=${GITLAB_SECRETS_SECRET_KEY_BASE?Variable not set}
119-
- GITLAB_SECRETS_OTP_KEY_BASE=${GITLAB_SECRETS_OTP_KEY_BASE?Variable not set}
120-
121-
- GITLAB_ROOT_PASSWORD=${GITLAB_ROOT_PASSWORD?Variable not set}
122-
- GITLAB_ROOT_EMAIL=${GITLAB_ROOT_EMAIL?Variable not set}
123-
124-
- GITLAB_NOTIFY_ON_BROKEN_BUILDS=${GITLAB_NOTIFY_ON_BROKEN_BUILDS:-true}
125-
- GITLAB_NOTIFY_PUSHER=${GITLAB_NOTIFY_PUSHER:-false}
126-
127-
- GITLAB_EMAIL=${GITLAB_EMAIL:?Variable not set}
128-
- GITLAB_EMAIL_REPLY_TO=${GITLAB_EMAIL_REPLY_TO?Variable not set}
129-
- GITLAB_INCOMING_EMAIL_ADDRESS=${GITLAB_INCOMING_EMAIL_ADDRESS?Variable not set}
130-
131-
- GITLAB_BACKUP_SCHEDULE=${GITLAB_BACKUP_SCHEDULE:-daily}
132-
- GITLAB_BACKUP_TIME=${GITLAB_BACKUP_TIME:-01:00}
133-
134-
- SMTP_ENABLED=${SMTP_ENABLED:-false}
135-
- SMTP_DOMAIN=${SMTP_DOMAIN:-www.example.com}
136-
- SMTP_HOST=${SMTP_HOST:-smtp.gmail.com}
137-
- SMTP_PORT=${SMTP_PORT:-587}
138-
- SMTP_USER=${SMTP_USER:-[email protected]}
139-
- SMTP_PASS=${SMTP_PASS:-password}
140-
- SMTP_STARTTLS=${SMTP_STARTTLS:-true}
141-
- SMTP_AUTHENTICATION=${SMTP_AUTHENTICATION:-login}
142-
143-
- IMAP_ENABLED=${IMAP_ENABLED:-false}
144-
- IMAP_HOST=${IMAP_HOST:-imap.gmail.com}
145-
- IMAP_PORT=${IMAP_PORT:-993}
146-
- IMAP_USER=${IMAP_USER:-[email protected]}
147-
- IMAP_PASS=${IMAP_PASS:-password}
148-
- IMAP_SSL=${IMAP_SSL:-true}
149-
- IMAP_STARTTLS=${IMAP_STARTTLS:-false}
150-
151-
- OAUTH_ENABLED=${OAUTH_ENABLED:-false}
152-
- OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER}
153-
- OAUTH_ALLOW_SSO=${OAUTH_ALLOW_SSO}
154-
- OAUTH_BLOCK_AUTO_CREATED_USERS=${OAUTH_BLOCK_AUTO_CREATED_USERS:-true}
155-
- OAUTH_AUTO_LINK_LDAP_USER=${OAUTH_AUTO_LINK_LDAP_USER:-false}
156-
- OAUTH_AUTO_LINK_SAML_USER=${OAUTH_AUTO_LINK_SAML_USER:-false}
157-
- OAUTH_EXTERNAL_PROVIDERS=${OAUTH_EXTERNAL_PROVIDERS}
158-
159-
- OAUTH_CAS3_LABEL=${OAUTH_CAS3_LABEL:-cas3}
160-
- OAUTH_CAS3_SERVER=${OAUTH_CAS3_SERVER}
161-
- OAUTH_CAS3_DISABLE_SSL_VERIFICATION=${OAUTH_CAS3_DISABLE_SSL_VERIFICATION:-false}
162-
- OAUTH_CAS3_LOGIN_URL=${OAUTH_CAS3_LOGIN_URL:-/cas/login}
163-
- OAUTH_CAS3_VALIDATE_URL=${OAUTH_CAS3_VALIDATE_URL:-/cas/p3/serviceValidate}
164-
- OAUTH_CAS3_LOGOUT_URL=${OAUTH_CAS3_LOGOUT_URL:-/cas/logout}
165-
166-
- OAUTH_GOOGLE_API_KEY=${OAUTH_GOOGLE_API_KEY}
167-
- OAUTH_GOOGLE_APP_SECRET=${OAUTH_GOOGLE_APP_SECRET}
168-
- OAUTH_GOOGLE_RESTRICT_DOMAIN=${OAUTH_GOOGLE_RESTRICT_DOMAIN}
169-
170-
- OAUTH_FACEBOOK_API_KEY=${OAUTH_FACEBOOK_API_KEY}
171-
- OAUTH_FACEBOOK_APP_SECRET=${OAUTH_FACEBOOK_APP_SECRET}
172-
173-
- OAUTH_TWITTER_API_KEY=${OAUTH_TWITTER_API_KEY}
174-
- OAUTH_TWITTER_APP_SECRET=${OAUTH_TWITTER_APP_SECRET}
175-
176-
- OAUTH_GITHUB_API_KEY=${OAUTH_GITHUB_API_KEY}
177-
- OAUTH_GITHUB_APP_SECRET=${OAUTH_GITHUB_APP_SECRET}
178-
- OAUTH_GITHUB_URL=${OAUTH_GITHUB_URL}
179-
- OAUTH_GITHUB_VERIFY_SSL=${OAUTH_GITHUB_VERIFY_SSL}
180-
181-
- OAUTH_GITLAB_API_KEY=${OAUTH_GITLAB_API_KEY}
182-
- OAUTH_GITLAB_APP_SECRET=${OAUTH_GITLAB_APP_SECRET}
183-
184-
- OAUTH_BITBUCKET_API_KEY=${OAUTH_BITBUCKET_API_KEY}
185-
- OAUTH_BITBUCKET_APP_SECRET=${OAUTH_BITBUCKET_APP_SECRET}
186-
187-
- OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=${OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL}
188-
- OAUTH_SAML_IDP_CERT_FINGERPRINT=${OAUTH_SAML_IDP_CERT_FINGERPRINT}
189-
- OAUTH_SAML_IDP_SSO_TARGET_URL=${OAUTH_SAML_IDP_SSO_TARGET_URL}
190-
- OAUTH_SAML_ISSUER=${OAUTH_SAML_ISSUER}
191-
- OAUTH_SAML_LABEL=${OAUTH_SAML_LABEL:-"Our SAML Provider"}
192-
- OAUTH_SAML_NAME_IDENTIFIER_FORMAT=${OAUTH_SAML_NAME_IDENTIFIER_FORMAT:-urn:oasis:names:tc:SAML:2.0:nameid-format:transient}
193-
- OAUTH_SAML_GROUPS_ATTRIBUTE=${OAUTH_SAML_GROUPS_ATTRIBUTE}
194-
- OAUTH_SAML_EXTERNAL_GROUPS=${OAUTH_SAML_EXTERNAL_GROUPS}
195-
- OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL}
196-
- OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME}
197-
- OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME}
198-
- OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME}
199-
- OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME}
200-
201-
- OAUTH_CROWD_SERVER_URL=${OAUTH_CROWD_SERVER_URL}
202-
- OAUTH_CROWD_APP_NAME=${OAUTH_CROWD_APP_NAME}
203-
- OAUTH_CROWD_APP_PASSWORD=${OAUTH_CROWD_APP_PASSWORD}
204-
205-
- OAUTH_AUTH0_CLIENT_ID=${OAUTH_AUTH0_CLIENT_ID}
206-
- OAUTH_AUTH0_CLIENT_SECRET=${OAUTH_AUTH0_CLIENT_SECRET}
207-
- OAUTH_AUTH0_DOMAIN=${OAUTH_AUTH0_DOMAIN}
208-
- OAUTH_AUTH0_SCOPE=${OAUTH_AUTH0_SCOPE}
209-
210-
- OAUTH_AZURE_API_KEY=${OAUTH_AZURE_API_KEY}
211-
- OAUTH_AZURE_API_SECRET=${OAUTH_AZURE_API_SECRET}
212-
- OAUTH_AZURE_TENANT_ID=${OAUTH_AZURE_TENANT_ID}
213-
214-
- RACK_ATTACK_ENABLED=${RACK_ATTACK_ENABLED:-false}
114+
- GITLAB_PORT=443
115+
- GITLAB_SSH_PORT=22
116+
- GITLAB_RELATIVE_URL_ROOT=
117+
- GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
118+
- GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
119+
- GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
120+
121+
- GITLAB_ROOT_PASSWORD=
122+
- GITLAB_ROOT_EMAIL=
123+
124+
- GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
125+
- GITLAB_NOTIFY_PUSHER=false
126+
127+
- GITLAB_EMAIL=[email protected]
128+
- GITLAB_EMAIL_REPLY_TO=[email protected]
129+
- GITLAB_INCOMING_EMAIL_ADDRESS=[email protected]
130+
131+
- GITLAB_BACKUP_SCHEDULE=daily
132+
- GITLAB_BACKUP_TIME=01:00
133+
134+
- SMTP_ENABLED=false
135+
- SMTP_DOMAIN=www.example.com
136+
- SMTP_HOST=smtp.gmail.com
137+
- SMTP_PORT=587
138+
- [email protected]
139+
- SMTP_PASS=password
140+
- SMTP_STARTTLS=true
141+
- SMTP_AUTHENTICATION=login
142+
143+
- IMAP_ENABLED=false
144+
- IMAP_HOST=imap.gmail.com
145+
- IMAP_PORT=993
146+
- [email protected]
147+
- IMAP_PASS=password
148+
- IMAP_SSL=true
149+
- IMAP_STARTTLS=false
150+
151+
- OAUTH_ENABLED=false
152+
- OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
153+
- OAUTH_ALLOW_SSO=
154+
- OAUTH_BLOCK_AUTO_CREATED_USERS=true
155+
- OAUTH_AUTO_LINK_LDAP_USER=false
156+
- OAUTH_AUTO_LINK_SAML_USER=false
157+
- OAUTH_EXTERNAL_PROVIDERS=
158+
159+
- OAUTH_CAS3_LABEL=cas3
160+
- OAUTH_CAS3_SERVER=
161+
- OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
162+
- OAUTH_CAS3_LOGIN_URL=/cas/login
163+
- OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
164+
- OAUTH_CAS3_LOGOUT_URL=/cas/logout
165+
166+
- OAUTH_GOOGLE_API_KEY=
167+
- OAUTH_GOOGLE_APP_SECRET=
168+
- OAUTH_GOOGLE_RESTRICT_DOMAIN=
169+
170+
- OAUTH_FACEBOOK_API_KEY=
171+
- OAUTH_FACEBOOK_APP_SECRET=
172+
173+
- OAUTH_TWITTER_API_KEY=
174+
- OAUTH_TWITTER_APP_SECRET=
175+
176+
- OAUTH_GITHUB_API_KEY=
177+
- OAUTH_GITHUB_APP_SECRET=
178+
- OAUTH_GITHUB_URL=
179+
- OAUTH_GITHUB_VERIFY_SSL=
180+
181+
- OAUTH_GITLAB_API_KEY=
182+
- OAUTH_GITLAB_APP_SECRET=
183+
184+
- OAUTH_BITBUCKET_API_KEY=
185+
- OAUTH_BITBUCKET_APP_SECRET=
186+
187+
- OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
188+
- OAUTH_SAML_IDP_CERT_FINGERPRINT=
189+
- OAUTH_SAML_IDP_SSO_TARGET_URL=
190+
- OAUTH_SAML_ISSUER=
191+
- OAUTH_SAML_LABEL="Our SAML Provider"
192+
- OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
193+
- OAUTH_SAML_GROUPS_ATTRIBUTE=
194+
- OAUTH_SAML_EXTERNAL_GROUPS=
195+
- OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
196+
- OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
197+
- OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
198+
- OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
199+
- OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
200+
201+
- OAUTH_CROWD_SERVER_URL=
202+
- OAUTH_CROWD_APP_NAME=
203+
- OAUTH_CROWD_APP_PASSWORD=
204+
205+
- OAUTH_AUTH0_CLIENT_ID=
206+
- OAUTH_AUTH0_CLIENT_SECRET=
207+
- OAUTH_AUTH0_DOMAIN=
208+
- OAUTH_AUTH0_SCOPE=
209+
210+
- OAUTH_AZURE_API_KEY=
211+
- OAUTH_AZURE_API_SECRET=
212+
- OAUTH_AZURE_TENANT_ID=
213+
214+
- RACK_ATTACK_ENABLED=false
215215
deploy:
216216
placement:
217217
constraints:
@@ -220,14 +220,14 @@ services:
220220
- traefik.enable=true
221221
- traefik.docker.network=traefik-public
222222
- traefik.constraint-label=traefik-public
223-
- traefik.http.routers.gitlab-registry-http.rule=Host(`${GITLAB_HOST?Variable not set}`)
224-
- traefik.http.routers.gitlab-registry-http.entrypoints=http
225-
- traefik.http.routers.gitlab-registry-http.middlewares=https-redirect
226-
- traefik.http.routers.gitlab-registry-https.rule=Host(`${GITLAB_HOST?Variable not set}`)
227-
- traefik.http.routers.gitlab-registry-https.entrypoints=https
228-
- traefik.http.routers.gitlab-registry-https.tls=true
229-
- traefik.http.routers.gitlab-registry-https.tls.certresolver=le
230-
- traefik.http.services.gitlab-registry.loadbalancer.server.port=8181
223+
- traefik.http.routers.gitlab-gitlab-http.rule=Host(`${GITLAB_HOST?Variable not set}`)
224+
- traefik.http.routers.gitlab-gitlab-http.entrypoints=http
225+
- traefik.http.routers.gitlab-gitlab-http.middlewares=https-redirect
226+
- traefik.http.routers.gitlab-gitlab-https.rule=Host(`${GITLAB_HOST?Variable not set}`)
227+
- traefik.http.routers.gitlab-gitlab-https.entrypoints=https
228+
- traefik.http.routers.gitlab-gitlab-https.tls=true
229+
- traefik.http.routers.gitlab-gitlab-https.tls.certresolver=le
230+
- traefik.http.services.gitlab-gitlab.loadbalancer.server.port=80
231231

232232
volumes:
233233
redis-data:

0 commit comments

Comments
 (0)