From b74990fdd567dcd6378a4e2656948519a7a04564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Thu, 26 Jul 2018 12:58:30 +0200 Subject: [PATCH] Add a custom Docker image for Danger jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- .gitlab-ci.yml | 2 ++ Dockerfile.danger | 5 +++++ Dockerfile.omnibus-gitlab-bionic | 2 +- Dockerfile.omnibus-gitlab-centos6 | 2 +- Dockerfile.omnibus-gitlab-centos7 | 2 +- Dockerfile.omnibus-gitlab-jessie | 2 +- Dockerfile.omnibus-gitlab-opensuse42.3 | 2 +- Dockerfile.omnibus-gitlab-stretch | 2 +- Dockerfile.omnibus-gitlab-trusty | 2 +- Dockerfile.omnibus-gitlab-wheezy | 2 +- Dockerfile.omnibus-gitlab-xenial | 2 +- 11 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 Dockerfile.danger diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89ca0a0..2139c46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,6 +95,7 @@ node-8.9-chrome-63.0-yarn-1.2 test: *test_custom # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/ ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom +danger test: *test_build gitlab-charts-build-base test: *test_build gitlab-qa test: *test_build omnibus-gitlab-bionic test: *test_build @@ -157,6 +158,7 @@ golang-1.10-git-2.17: *build_and_deploy_custom # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/ ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom +danger: *build_and_deploy gitlab-charts-build-base: *build_and_deploy gitlab-qa: *build_and_deploy omnibus-gitlab-bionic: *build_and_deploy diff --git a/Dockerfile.danger b/Dockerfile.danger new file mode 100644 index 0000000..59fcbd1 --- /dev/null +++ b/Dockerfile.danger @@ -0,0 +1,5 @@ +FROM ruby:2.4.4-alpine +MAINTAINER GitLab Quality Team + +RUN apk update && apk upgrade && apk add --no-cache git +RUN gem install danger-gitlab --no-document diff --git a/Dockerfile.omnibus-gitlab-bionic b/Dockerfile.omnibus-gitlab-bionic index 96c556c..772d0c7 100644 --- a/Dockerfile.omnibus-gitlab-bionic +++ b/Dockerfile.omnibus-gitlab-bionic @@ -18,4 +18,4 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.ta && make \ && make install -RUN gem install bundler +RUN gem install bundler --no-document diff --git a/Dockerfile.omnibus-gitlab-centos6 b/Dockerfile.omnibus-gitlab-centos6 index 88900e1..69371fa 100644 --- a/Dockerfile.omnibus-gitlab-centos6 +++ b/Dockerfile.omnibus-gitlab-centos6 @@ -17,4 +17,4 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.ta && make \ && make install -RUN gem install bundler +RUN gem install bundler --no-document diff --git a/Dockerfile.omnibus-gitlab-centos7 b/Dockerfile.omnibus-gitlab-centos7 index 283490f..24dcfcc 100644 --- a/Dockerfile.omnibus-gitlab-centos7 +++ b/Dockerfile.omnibus-gitlab-centos7 @@ -17,4 +17,4 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.ta && make \ && make install -RUN gem install bundler +RUN gem install bundler --no-document diff --git a/Dockerfile.omnibus-gitlab-jessie b/Dockerfile.omnibus-gitlab-jessie index 2eed770..7118368 100644 --- a/Dockerfile.omnibus-gitlab-jessie +++ b/Dockerfile.omnibus-gitlab-jessie @@ -18,4 +18,4 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.ta && make \ && make install -RUN gem install bundler +RUN gem install bundler --no-document diff --git a/Dockerfile.omnibus-gitlab-opensuse42.3 b/Dockerfile.omnibus-gitlab-opensuse42.3 index e2cbc4e..644a491 100644 --- a/Dockerfile.omnibus-gitlab-opensuse42.3 +++ b/Dockerfile.omnibus-gitlab-opensuse42.3 @@ -18,4 +18,4 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.ta && make \ && make install -RUN gem install bundler +RUN gem install bundler --no-document diff --git a/Dockerfile.omnibus-gitlab-stretch b/Dockerfile.omnibus-gitlab-stretch index 121b452..7509398 100644 --- a/Dockerfile.omnibus-gitlab-stretch +++ b/Dockerfile.omnibus-gitlab-stretch @@ -19,4 +19,4 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.ta && make \ && make install -RUN gem install bundler +RUN gem install bundler --no-document diff --git a/Dockerfile.omnibus-gitlab-trusty b/Dockerfile.omnibus-gitlab-trusty index a090c32..7b1857b 100644 --- a/Dockerfile.omnibus-gitlab-trusty +++ b/Dockerfile.omnibus-gitlab-trusty @@ -12,4 +12,4 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.ta && make \ && make install -RUN gem install bundler +RUN gem install bundler --no-document diff --git a/Dockerfile.omnibus-gitlab-wheezy b/Dockerfile.omnibus-gitlab-wheezy index 17bfc32..2ea33cf 100644 --- a/Dockerfile.omnibus-gitlab-wheezy +++ b/Dockerfile.omnibus-gitlab-wheezy @@ -18,4 +18,4 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.ta && make \ && make install -RUN gem install bundler +RUN gem install bundler --no-document diff --git a/Dockerfile.omnibus-gitlab-xenial b/Dockerfile.omnibus-gitlab-xenial index 026c866..a10c109 100644 --- a/Dockerfile.omnibus-gitlab-xenial +++ b/Dockerfile.omnibus-gitlab-xenial @@ -18,4 +18,4 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.ta && make \ && make install -RUN gem install bundler +RUN gem install bundler --no-document