diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-19 08:35:25 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-19 13:57:02 +0000 |
| commit | ff84662fb089f3320b8537922727863e2cdb0d8c (patch) | |
| tree | 44f2bc9e5b98b9dda0e39249a5d8edde42201452 | |
| parent | e4130eeae8515bc7e8044d993c42896aab06b976 (diff) | |
| download | gitlab-ce-ff84662fb089f3320b8537922727863e2cdb0d8c.tar.gz | |
Merge branch '10471-remove-before-script-for-dast-template-ce' into 'master'
Remove before_script from DAST vendored template
See merge request gitlab-org/gitlab-ce!26281
(cherry picked from commit 7cfc090d2dd0a28e6b0f44cdc2a50a45facf1f85)
0ed42904 Move dast_run under script section, EE counterpart
| -rw-r--r-- | lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml index 4e708f229cd..ef6d7866e85 100644 --- a/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml @@ -21,20 +21,19 @@ dast: allow_failure: true services: - docker:stable-dind - before_script: + script: - export DAST_VERSION=${SP_VERSION:-$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')} - | function dast_run() { docker run \ - --env DAST_TARGET_AVAILABILITY_TIMEOUT \ - --volume "$PWD:/output" \ - --volume /var/run/docker.sock:/var/run/docker.sock \ - -w /output \ - "registry.gitlab.com/gitlab-org/security-products/dast:$DAST_VERSION" \ - /analyze -t $DAST_WEBSITE \ - "$@" + --env DAST_TARGET_AVAILABILITY_TIMEOUT \ + --volume "$PWD:/output" \ + --volume /var/run/docker.sock:/var/run/docker.sock \ + -w /output \ + "registry.gitlab.com/gitlab-org/security-products/dast:$DAST_VERSION" \ + /analyze -t $DAST_WEBSITE \ + "$@" } - script: - | if [ -n "$DAST_AUTH_URL" ] then |