diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-05-09 17:27:12 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-05-09 17:27:12 +0300 |
| commit | 8391d76e1e0731e6f5270f1a73d4a8aa05cb92e8 (patch) | |
| tree | b9e1ae169559fbd1be0fcf712b1c9c2c535cc94d | |
| parent | c34b18b0a82ff01e44ede810dc0c12e72d25a439 (diff) | |
| parent | ed4bd603f868e5a836f64332f084287a527f6d42 (diff) | |
Merge branch 'zj-dangercontainer' into 'master'
Add danger container to the Gitaly project
See merge request gitlab-org/gitaly!711
| -rw-r--r-- | .gitlab-ci.yml | 21 | ||||
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | _support/dangercontainer/Dockerfile | 4 |
3 files changed, 26 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0450b121..8397d9d5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,8 +15,11 @@ verify: - make verify danger-review: - image: registry.gitlab.com/zj/dangercontainer:latest + image: registry.gitlab.com/gitlab-org/gitaly/dangercontainer:latest stage: build + except: + - tags + - master script: - git version - danger @@ -192,6 +195,22 @@ update-downstream-server-version: - ruby _support/update-downstream-server-version allow_failure: true +create-dangercontainer: + stage: publish + image: docker:git + services: + - docker:dind + only: + - master@gitlab-org/gitaly + variables: + IMAGE_TAG: "${CI_REGISTRY_IMAGE}/dangercontainer:latest" + script: + - cd _support/dangercontainer + - docker build -t $IMAGE_TAG ./ + - docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY + - docker push $IMAGE_TAG + - docker logout $CI_REGISTRY + # Ensure that gitlab-git vendoring from gitlab-ce is functioning test-vendor-gitaly-ruby: stage: test diff --git a/CHANGELOG.md b/CHANGELOG.md index 776c892c8..7a730662e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ UNRELEASED +- Add danger container to the Gitaly project + https://gitlab.com/gitlab-org/gitaly/merge_requests/711 - Remove ruby concurrency limiter https://gitlab.com/gitlab-org/gitaly/merge_requests/708 - Introduce src-d/go-git as dependency diff --git a/_support/dangercontainer/Dockerfile b/_support/dangercontainer/Dockerfile new file mode 100644 index 000000000..9cd6b6115 --- /dev/null +++ b/_support/dangercontainer/Dockerfile @@ -0,0 +1,4 @@ +FROM ruby:alpine + +RUN apk update && apk upgrade && apk add --no-cache git +RUN gem install danger-gitlab --no-document |