From 972711b3b241e873dbe378363b694e65dcca4e69 Mon Sep 17 00:00:00 2001 From: Tuna Date: Sun, 6 Nov 2016 18:57:39 +0100 Subject: [PATCH] fix docker-gitlab example --- examples/docker-gitlab.yml | 169 ++++++++++++++++++++++++++++--------- 1 file changed, 129 insertions(+), 40 deletions(-) diff --git a/examples/docker-gitlab.yml b/examples/docker-gitlab.yml index cf2e24b1..cf4fdb09 100644 --- a/examples/docker-gitlab.yml +++ b/examples/docker-gitlab.yml @@ -1,46 +1,80 @@ -postgresql: - restart: always - image: sameersbn/postgresql:9.4-18 - environment: +version: '2' + +services: + redis: + restart: always + image: sameersbn/redis:latest + command: + - --loglevel warning + volumes: + - /srv/docker/gitlab/redis:/var/lib/redis + ports: + - "6379" + + postgresql: + restart: always + image: sameersbn/postgresql:9.5-3 + volumes: + - /srv/docker/gitlab/postgresql:/var/lib/postgresql + environment: - DB_USER=gitlab - DB_PASS=password - DB_NAME=gitlabhq_production - DB_EXTENSION=pg_trgm - volumes: - - /srv/docker/gitlab/postgresql:/var/lib/postgresql:rw - ports: - - "5432" -gitlab: - restart: always - image: sameersbn/gitlab:8.6.4 - links: - - redisio + ports: + - "5432" + + gitlab: + restart: always + image: sameersbn/gitlab:8.13.3 + depends_on: + - redis - postgresql - ports: + ports: - "10080:80" - "10022:22" - environment: - - TZ=Asia/Kolkata - - GITLAB_TIMEZONE=Kolkata - - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alpha-numeric-string - - GITLAB_HOST=git.default.cluster.local - - GITLAB_PORT=80 - - GITLAB_SSH_PORT=22 - - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true - - GITLAB_NOTIFY_PUSHER=false - - GITLAB_EMAIL=notifications@example.com - - GITLAB_EMAIL_REPLY_TO=noreply@example.com - - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com - - GITLAB_BACKUP_SCHEDULE=daily - - GITLAB_BACKUP_TIME=01:00 - - DB_TYPE=postgres + volumes: + - /srv/docker/gitlab/gitlab:/home/git/data + environment: + - DEBUG=false + + - DB_ADAPTER=postgresql - DB_HOST=postgresql - DB_PORT=5432 - DB_USER=gitlab - DB_PASS=password - - DB_NAME=gitlab_production - - REDIS_HOST=redisio + - DB_NAME=gitlabhq_production + + - REDIS_HOST=redis - REDIS_PORT=6379 + + - TZ=Asia/Kolkata + - GITLAB_TIMEZONE=Kolkata + + - GITLAB_HTTPS=false + - SSL_SELF_SIGNED=false + + - GITLAB_HOST=localhost + - GITLAB_PORT=10080 + - GITLAB_SSH_PORT=10022 + - GITLAB_RELATIVE_URL_ROOT= + - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string + - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string + - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string + + - GITLAB_ROOT_PASSWORD= + - GITLAB_ROOT_EMAIL= + + - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true + - GITLAB_NOTIFY_PUSHER=false + + - GITLAB_EMAIL=notifications@example.com + - GITLAB_EMAIL_REPLY_TO=noreply@example.com + - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com + + - GITLAB_BACKUP_SCHEDULE=daily + - GITLAB_BACKUP_TIME=01:00 + - SMTP_ENABLED=false - SMTP_DOMAIN=www.example.com - SMTP_HOST=smtp.gmail.com @@ -49,6 +83,7 @@ gitlab: - SMTP_PASS=password - SMTP_STARTTLS=true - SMTP_AUTHENTICATION=login + - IMAP_ENABLED=false - IMAP_HOST=imap.gmail.com - IMAP_PORT=993 @@ -56,12 +91,66 @@ gitlab: - IMAP_PASS=password - IMAP_SSL=true - IMAP_STARTTLS=false - volumes: - - /srv/docker/gitlab/gitlab:/home/git/data:rw -redisio: - restart: always - image: sameersbn/redis - volumes: - - /srv/docker/gitlab/redis:/var/lib/redis:rw - ports: - - "6379" + + - OAUTH_ENABLED=false + - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER= + - OAUTH_ALLOW_SSO= + - OAUTH_BLOCK_AUTO_CREATED_USERS=true + - OAUTH_AUTO_LINK_LDAP_USER=false + - OAUTH_AUTO_LINK_SAML_USER=false + - OAUTH_EXTERNAL_PROVIDERS= + + - OAUTH_CAS3_LABEL=cas3 + - OAUTH_CAS3_SERVER= + - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false + - OAUTH_CAS3_LOGIN_URL=/cas/login + - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate + - OAUTH_CAS3_LOGOUT_URL=/cas/logout + + - OAUTH_GOOGLE_API_KEY= + - OAUTH_GOOGLE_APP_SECRET= + - OAUTH_GOOGLE_RESTRICT_DOMAIN= + + - OAUTH_FACEBOOK_API_KEY= + - OAUTH_FACEBOOK_APP_SECRET= + + - OAUTH_TWITTER_API_KEY= + - OAUTH_TWITTER_APP_SECRET= + + - OAUTH_GITHUB_API_KEY= + - OAUTH_GITHUB_APP_SECRET= + - OAUTH_GITHUB_URL= + - OAUTH_GITHUB_VERIFY_SSL= + + - OAUTH_GITLAB_API_KEY= + - OAUTH_GITLAB_APP_SECRET= + + - OAUTH_BITBUCKET_API_KEY= + - OAUTH_BITBUCKET_APP_SECRET= + + - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL= + - OAUTH_SAML_IDP_CERT_FINGERPRINT= + - OAUTH_SAML_IDP_SSO_TARGET_URL= + - OAUTH_SAML_ISSUER= + - OAUTH_SAML_LABEL="Our SAML Provider" + - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient + - OAUTH_SAML_GROUPS_ATTRIBUTE= + - OAUTH_SAML_EXTERNAL_GROUPS= + - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL= + - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME= + - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME= + - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME= + + - OAUTH_CROWD_SERVER_URL= + - OAUTH_CROWD_APP_NAME= + - OAUTH_CROWD_APP_PASSWORD= + + - OAUTH_AUTH0_CLIENT_ID= + - OAUTH_AUTH0_CLIENT_SECRET= + - OAUTH_AUTH0_DOMAIN= + + - OAUTH_AZURE_API_KEY= + - OAUTH_AZURE_API_SECRET= + - OAUTH_AZURE_TENANT_ID= + labels: + kompose.service.type: NodePort