summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-12-20 15:41:26 +0000
committerJoshua Lambert <joshua@gitlab.com>2017-12-21 08:29:02 -0500
commit06175be1a646a7f9a531239079e7350847443ef1 (patch)
treea48ddc020bde2aa7ae19f0400dd9c46bd649b70b
parent6f01e7e3ea3e5e3c49f26ae42d0dba68141069f5 (diff)
downloadgitlab-ce-06175be1a646a7f9a531239079e7350847443ef1.tar.gz
Remove SAST:Image for now.
-rw-r--r--vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml25
1 files changed, 0 insertions, 25 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
index c169d4eff2e..18910a46d11 100644
--- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
@@ -108,19 +108,6 @@ sast:
- sast .
artifacts:
paths: [gl-sast-report.json]
-
-sast:image:
- image: docker:latest
- variables:
- DOCKER_DRIVER: overlay2
- allow_failure: true
- services:
- - docker:dind
- script:
- - setup_docker
- - sast_image
- artifacts:
- paths: [gl-sast-image-report.json]
review:
stage: review
@@ -256,18 +243,6 @@ production:
export CI_APPLICATION_TAG=$CI_COMMIT_SHA
export CI_CONTAINER_NAME=ci_job_build_${CI_JOB_ID}
export TILLER_NAMESPACE=$KUBE_NAMESPACE
-
- function sast_image() {
- docker run -d --name db arminc/clair-db:latest
- docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
- apk add -U wget ca-certificates
- docker pull ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG}
- wget https://github.com/arminc/clair-scanner/releases/download/v6/clair-scanner_linux_386
- mv clair-scanner_linux_386 clair-scanner
- chmod +x clair-scanner
- touch clair-whitelist.yml
- ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-image-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} || true
- }
function codeclimate() {
cc_opts="--env CODECLIMATE_CODE="$PWD" \