summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-01-22 14:45:34 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-01-22 14:45:34 +0100
commitd91335293a2c950503f36071899300030b6ec0b1 (patch)
tree0c8788e4219754abd1aaa5dc8e50f477a7dd9cfa /.gitlab-ci.yml
parent6c4961ae4857065e0c2f49ffbc1c4206b80bcc78 (diff)
downloadgitlab-ce-d91335293a2c950503f36071899300030b6ec0b1.tar.gz
More docker stuff in gitlab-ci.yml
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml14
1 files changed, 10 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbc812a3b88..2dc09e4a1a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,13 @@
-# This file is generated by GitLab CI
+image: "ruby:2.1"
+
+services:
+ - mysql:latest
+ - postgres:latest
+ - redis:latest
+
+variables:
+ MYSQL_ALLOW_EMPTY_PASSWORD: "1"
+
before_script:
- ./scripts/prepare_build.sh
- ruby -v
@@ -10,9 +19,6 @@ before_script:
- bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
- RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load db:migrate
-variables:
- MYSQL_ALLOW_EMPTY_PASSWORD: "1"
-
spec:feature:
script:
- RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null