kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '51450-vendor-refactor-registry-login' into 'master'

Browse source 
Vendor Auto-DevOps.gitlab-ci.yml for refactor to create registry_login() function.

Closes #51450

See merge request gitlab-org/gitlab-ce!21714
This commit is contained in:
Kamil Trzciński 2018-09-13 10:56:22 +00:00
commit bfe0b0fed0
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/51450-vendor-refactor-registry-login.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Vendor Auto-DevOps.gitlab-ci.yml to refactor registry_login
merge_request: 21714
author: Laurent Goderre @LaurentGoderre
type: changed

12
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml vendored
View file

@ -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..."