Merge branch 'docker-image' into 'master'

Added support for image and services in YAML

- [x] Prepare changes for GitLab CI
- [x] Prepare documentation (70% done): https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/178
- [x] Prepare GitLab Runner - changes are pushed to bleeding edge

/cc @vsizov

See merge request !181

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index d996689..b7e9672 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -14,6 +14,7 @@
 #  commit_id   :integer
 #  coverage    :float
 #  commands    :text
+#  options     :text
 #
 
 require 'spec_helper'
@@ -167,6 +168,20 @@ describe Build do
     end
   end
 
+  describe :options do
+    let(:options) {
+      {
+        :image => "ruby:2.1",
+        :services => [
+          "postgres"
+        ]
+      }
+    }
+
+    subject { build.options }
+    it { should eq(options) }
+  end
+
   describe :ref do
     subject { build.ref }