summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-10-31 17:13:50 +0000
committerRobert Speicher <robert@gitlab.com>2018-10-31 17:13:50 +0000
commitdd807d46ff701be1df0989f9f5c8f5f74badfa9c (patch)
tree2011b52e4900cc9bb7630461295531213cb0d079 /.gitlab-ci.yml
parent3c01ac9f7ef460e4d4e9b590ad7531386012d7ba (diff)
parent70ee4e1b3ea9b5fa59fbe3e60733c5601804fc9e (diff)
downloadgitlab-ce-dd807d46ff701be1df0989f9f5c8f5f74badfa9c.tar.gz
Merge branch 'add-docker-assets-image' into 'master'
Build an assets only container See merge request gitlab-org/gitlab-ce!22235
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d70eae0d1e..0e7a67f9cc1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -694,7 +694,10 @@ gitlab:setup-mysql:
# Frontend-related jobs
gitlab:assets:compile:
<<: *dedicated-no-docs-and-no-qa-pull-cache-job
+ image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1
dependencies: []
+ services:
+ - docker:stable-dind
variables:
NODE_ENV: "production"
RAILS_ENV: "production"
@@ -703,18 +706,23 @@ gitlab:assets:compile:
WEBPACK_REPORT: "true"
# we override the max_old_space_size to prevent OOM errors
NODE_OPTIONS: --max_old_space_size=3584
+ DOCKER_DRIVER: overlay2
+ DOCKER_HOST: tcp://docker:2375
script:
- date
- yarn install --frozen-lockfile --production --cache-folder .yarn-cache
- date
- free -m
- bundle exec rake gitlab:assets:compile
+ - scripts/build_assets_image
artifacts:
name: webpack-report
expire_in: 31d
paths:
- webpack-report/
- public/assets/
+ tags:
+ - docker
karma:
<<: *dedicated-no-docs-pull-cache-job