Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
c77e16429b
commit
9083509f2f
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix variable passthrough in the SAST CI/CD template when using DinD
|
||||
merge_request: 25697
|
||||
author:
|
||||
type: fixed
|
|
@ -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).
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue