add .envrc

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

diff --git a/roles/screwdriver-on-docker.rb b/roles/screwdriver-on-docker.rb
index 6891ddc..89b24e4 100644 (file)
--- a/roles/screwdriver-on-docker.rb
+++ b/roles/screwdriver-on-docker.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2017, whitestar
+# Copyright 2017-2018, whitestar
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,15 +28,23 @@ run_list(
 )
 
 override_attributes(
+  'docker-grid' => {
+    'engine' => {
+      #'skip_setup' => true,  # default: false
+    },
+    'compose' => {
+      #'skip_setup' => true,  # default: false
+    },
+  },
   'screwdriver' => {
     'api' => {
       'config' => {
         'scms' => {
+=begin
+          # **REQUIRED**: SCM settings
           'github.com' => {  # id and display name
             'plugin' => 'github',
             'config' => {
-              # **REQUIRED**: SCM OAuth client ID, secret and webhook secret (GitHub only)
-=begin
               # These 3 secrets should be set by the following `['screwdriver']['api']['scms_vault_items']` attribute.
               'oauthClientId' => 'YOU-PROBABLY-WANT-SOMETHING-HERE',  # The client id used for OAuth with github. GitHub OAuth (https://developer.github.com/v3/oauth/)
               'oauthClientSecret' => 'AGAIN-SOMETHING-HERE-IS-USEFUL',  # The client secret used for OAuth with github
@@ -45,9 +53,9 @@ override_attributes(
               'username' => 'sd-buildbot',  # [Optional] Username for code checkout
               'email' => 'dev-null@screwdriver.cd',  # [Optional] Email for code checkout
               'privateRepo' => false,  # [Optional] Set to true to support private repo; will need read and write access to public and private repos (https://developer.github.com/v3/oauth/#scopes)
-=end
             },
           },
+=end
         },
       },
     },
@@ -55,6 +63,7 @@ override_attributes(
       'config' => {
         'services' => {
           'api' => {
+            'image' => 'screwdrivercd/screwdriver:latest',
             'ports' => [
               #"#{api_port}:80",
             ],
@@ -66,6 +75,7 @@ override_attributes(
             },
           },
           'ui' => {
+            'image' => 'screwdrivercd/ui:latest',
             'ports' => [
               #"#{ui_port}:80",
             ],
@@ -76,6 +86,7 @@ override_attributes(
             },
           },
           'store' => {
+            'image' => 'screwdrivercd/store:latest',
             'ports' => [
               #"#{store_port}:80",
             ],