updates screwdriver roles.

[metasearch/grid-chef-repo.git] / roles / gitlab-on-docker.rb

diff --git a/roles/gitlab-on-docker.rb b/roles/gitlab-on-docker.rb
index fd00e60..7610b04 100644 (file)
--- a/roles/gitlab-on-docker.rb
+++ b/roles/gitlab-on-docker.rb
@@ -1,13 +1,30 @@
+#
+# Copyright 2017, whitestar
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 name 'gitlab-on-docker'
 description 'GitLab on Docker'
 
-gitlab_cn = 'gitlab.io.example.com'
-gitlab_http_port = '8080'
-gitlab_ssh_port = '2022'
+#gitlab_cn = 'gitlab.io.example.com'  # default: node['fqdn']
+#gitlab_http_port = '80'  # default: 80, and 8080 already in use.
+#gitlab_ssh_port = '2022'
 
 run_list(
   'role[docker]',
   'recipe[gitlab-grid::docker-compose]',
+  'recipe[platform_utils::sysctl]',
 )
 
 #env_run_lists()
@@ -15,31 +32,43 @@ run_list(
 #default_attributes()
 
 override_attributes(
+  'docker-grid' => {
+    'engine' => {
+      'skip_setup' => false,
+    },
+    'compose' => {
+      'skip_setup' => false,
+    },
+  },
   'gitlab-grid' => {
     'gitlab.rb' => {
-      'external_url' => "http://#{gitlab_cn}:#{gitlab_http_port}",
+      #'external_url' => "http://#{gitlab_cn}:#{gitlab_http_port}",
       'gitlab_rails' => {
-        'time_zone' => 'UTC',
         #'time_zone' => 'Asia/Tokyo',
-        'gitlab_shell_ssh_port' => gitlab_ssh_port.to_i,
-      },
-      'nginx' => {
-        'redirect_http_to_https' => false,
+        #'gitlab_shell_ssh_port' => gitlab_ssh_port.to_i,
       },
     },
     'docker-compose' => {
       'config' => {
-        # Version 2 docker-compose format
-        'version' => '2',
         'services' => {
           'gitlab' => {
-            'restart' => 'always',
-            'image' => 'gitlab/gitlab-ce:latest',
-            'hostname' => gitlab_cn,
-            'ports' => [
-              "#{gitlab_http_port}:#{gitlab_http_port}",
-              "#{gitlab_ssh_port}:22",
-            ],
+            #'hostname' => gitlab_cn,
+            #'ports' => [
+              #"#{gitlab_http_port}:#{gitlab_http_port}",
+              #"#{gitlab_ssh_port}:22",
+            #],
+          },
+        },
+      },
+    },
+  },
+  'platform_utils' => {
+    'sysctl' => {
+      'configs' => {
+        '80-gitlab' => {
+          'action' => :create,
+          'params' => {
+            'vm.swappiness' => '10',  # default: '60'
           },
         },
       },