diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-13 10:56:22 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-13 10:56:22 +0000 |
| commit | bfe0b0fed0d1bfa48ac61781361369a4946684b8 (patch) | |
| tree | 489b05d8b42b600fa3546250fb498df3b63c03fe /vendor | |
| parent | 126889848d0c16a37c0adc8c18cf6b88bd9d1cb1 (diff) | |
| parent | 97ad3f91784b0cce18bc3d1484fca3e5d08547c3 (diff) | |
| download | gitlab-ce-bfe0b0fed0d1bfa48ac61781361369a4946684b8.tar.gz | |
Merge branch '51450-vendor-refactor-registry-login' into 'master'
Vendor Auto-DevOps.gitlab-ci.yml for refactor to create registry_login() function.
Closes #51450
See merge request gitlab-org/gitlab-ce!21714
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index 0b362fa0bee..1c488b040f2 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -451,12 +451,16 @@ rollout 100%: # Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Security Products export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - function container_scanning() { + function registry_login() { if [[ -n "$CI_REGISTRY_USER" ]]; then echo "Logging to GitLab Container Registry with CI credentials..." docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY" echo "" fi + } + + function container_scanning() { + registry_login docker run -d --name db arminc/clair-db:latest docker run -p 6060:6060 --link db:postgres -d --name clair --restart on-failure arminc/clair-local-scan:v2.0.1 @@ -700,11 +704,7 @@ rollout 100%: } function build() { - if [[ -n "$CI_REGISTRY_USER" ]]; then - echo "Logging to GitLab Container Registry with CI credentials..." - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY" - echo "" - fi + registry_login if [[ -f Dockerfile ]]; then echo "Building Dockerfile-based application..." |