diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-23 15:09:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-23 15:09:08 +0000 |
| commit | 9083509f2f0e424b1d53cca4877d994d2050562b (patch) | |
| tree | 8fc6f249d4139f0ce10fec54a4ac2d8ba05c7814 | |
| parent | c77e16429bb6102bd81ac0c2d651d8c5c6ff40a5 (diff) | |
| download | gitlab-ce-9083509f2f0e424b1d53cca4877d994d2050562b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | changelogs/unreleased/cat-fix-env-passthrough-sast-205694.yml | 5 | ||||
| -rw-r--r-- | doc/user/packages/maven_repository/index.md | 4 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/changelogs/unreleased/cat-fix-env-passthrough-sast-205694.yml b/changelogs/unreleased/cat-fix-env-passthrough-sast-205694.yml new file mode 100644 index 00000000000..6678026b896 --- /dev/null +++ b/changelogs/unreleased/cat-fix-env-passthrough-sast-205694.yml @@ -0,0 +1,5 @@ +--- +title: Fix variable passthrough in the SAST CI/CD template when using DinD +merge_request: 25697 +author: +type: fixed diff --git a/doc/user/packages/maven_repository/index.md b/doc/user/packages/maven_repository/index.md index c1f943017bc..8e06153ccb2 100644 --- a/doc/user/packages/maven_repository/index.md +++ b/doc/user/packages/maven_repository/index.md @@ -60,7 +60,7 @@ published to the GitLab Package Registry. Start by opening your terminal and creating a directory where you would like to store the project in your environment. From inside the directory, you can run -the following Maven command to initalize a new package: +the following Maven command to initialize a new package: ```shell mvn archetype:generate -DgroupId=com.mycompany.mydepartment -DartifactId=my-project -DarchetypeArtifactId=maven-archetype-quickstart -DinteractiveMode=false @@ -71,7 +71,7 @@ The arguments are as follows: - `DgroupId`: A unique string that identifies your package. You should follow the [Maven naming conventions](https://maven.apache.org/guides/mini/guide-naming-conventions.html). - `DartifactId`: The name of the JAR, appended to the end of the `DgroupId`. -- `DarchetypeArtifactId`: The archetype used to create the intial structure of +- `DarchetypeArtifactId`: The archetype used to create the initial structure of the project. - `DinteractiveMode`: Create the project using batch mode (optional). diff --git a/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml index 51a1f4e549b..9f9975f9e1c 100644 --- a/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml @@ -36,9 +36,9 @@ sast: export DOCKER_HOST='tcp://localhost:2375' fi fi + - ENVS=`printenv | grep -vE '^(DOCKER_|CI|GITLAB_|FF_|HOME|PWD|OLDPWD|PATH|SHLVL|HOSTNAME)' | sed -n '/^[^\t]/s/=.*//p' | sed '/^$/d' | sed 's/^/-e /g' | tr '\n' ' '` - | - ENVS=`printenv | grep -vE '^(DOCKER_|CI|GITLAB_|FF_|HOME|PWD|OLDPWD|PATH|SHLVL|HOSTNAME)' | sed -n '/^[^\t]/s/=.*//p' | sed '/^$/d' | sed 's/^/-e /g' | tr '\n' ' '` - docker run "$ENVS" \ + docker run $ENVS \ --volume "$PWD:/code" \ --volume /var/run/docker.sock:/var/run/docker.sock \ "registry.gitlab.com/gitlab-org/security-products/sast:$SAST_VERSION" /app/bin/run /code |