upgrade to gitlab-6.7.2

Author: Sameer Naik

Changelog.md

@@ -1,6 +1,7 @@
 # Changelog
 
-**latest a.k.a HEAD**
+**6.7.2**
+- upgrade gitlab to 6.7.2
 - upgrade gitlab-shell to 1.9.1
 - reorganize repo
 - do not perform system upgrades (http://crosbymichael.com/dockerfile-best-practices-take-2.html)

README.md

@@ -33,7 +33,7 @@
 Dockerfile to build a GitLab container image.
 
 ## Version
-Current Version: 6.6.5
+Current Version: 6.7.2
 
 # Hardware Requirements
 
@@ -82,7 +82,7 @@ docker pull sameersbn/gitlab
 Since version 6.3.0, the image builds are being tagged. You can now pull a particular version of gitlab by specifying the version number. For example,
 
 ```bash
-docker pull sameersbn/gitlab:6.6.5
+docker pull sameersbn/gitlab:6.7.2
 ```
 
 Alternately you can build the image yourself.

assets/setup/config.tar.bz2

@@ -121,7 +121,6 @@ production: &base
   ldap:
     enabled: false
     host: '_your_ldap_server'
-    base: '_the_base_where_you_search_for_users'
     port: 636
     uid: 'sAMAccountName'
     method: 'ssl' # "tls" or "ssl" or "plain"
@@ -138,6 +137,20 @@ production: &base
     # disable this setting, because the userPrincipalName contains an '@'.
     allow_username_or_email_login: true
 
+    # Base where we can search for users
+    #
+    #   Ex. ou=People,dc=gitlab,dc=example
+    #
+    base: ''
+
+    # Filter LDAP users
+    #
+    #   Format: RFC 4515
+    #   Ex. (employeeType=developer)
+    #
+    user_filter: ''
+
+
   ## OmniAuth settings
   omniauth:
     # Allow login via Twitter, Google, etc. using OmniAuth providers
@@ -217,6 +230,10 @@ production: &base
     ## Google analytics. Uncomment if you want it
     # google_analytics_id: '_your_tracking_id'
 
+    ## Piwik analytics.
+    # piwik_url: '_your_piwik_url'
+    # piwik_site_id: '_your_piwik_site_id'
+
     ## Text under sign-in page (Markdown enabled)
     # sign_in_text: |
     #   ![Company Logo](http://www.companydomain.com/logo.png)
@@ -227,6 +244,11 @@ development:
 
 test:
   <<: *base
+  gravatar:
+    enabled: true
+  gitlab:
+    host: {{GITLAB_HOST}}
+    port: {{GITLAB_PORT}}
   issues_tracker:
     redmine:
       title: "Redmine"

assets/setup/config/gitlabhq/gitlab.yml

@@ -24,10 +24,10 @@ server {
   server_name {{YOUR_SERVER_FQDN}};     # e.g., server_name source.example.com;
   server_tokens off;     # don't show the version number, a security best practice
   root /home/git/gitlab/public;
-
+  
   # Increase this if you want to upload large attachments
   # Or if you want to accept large git objects over http
-  client_max_body_size 5m;
+  client_max_body_size 20m;
 
   # individual nginx logs for this gitlab vhost
   access_log  /var/log/nginx/gitlab_access.log;

assets/setup/config/nginx/gitlab

@@ -22,7 +22,7 @@ sudo -u git -H ./bin/install
 
 # install gitlab
 sudo -u git -H mkdir -p /home/git/gitlab
-wget "https://github.com/gitlabhq/gitlabhq/archive/v6.6.5.tar.gz" -O - | tar -zvxf - --strip=1 -C /home/git/gitlab/
+wget "https://github.com/gitlabhq/gitlabhq/archive/v6.7.2.tar.gz" -O - | tar -zvxf - --strip=1 -C /home/git/gitlab/
 chown -R git:git /home/git/gitlab/
 
 cd /home/git/gitlab