Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4f4c8a49
Commit
4f4c8a49
authored
May 23, 2018
by
Olivier Gonzalez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Documentation review's follow up
parent
349907e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
doc/ci/examples/container_scanning.md
doc/ci/examples/container_scanning.md
+2
-2
doc/user/project/merge_requests/container_scanning.md
doc/user/project/merge_requests/container_scanning.md
+2
-2
No files found.
doc/ci/examples/container_scanning.md
View file @
4f4c8a49
...
...
@@ -56,11 +56,11 @@ so, the CI/CD job must be named `container_scanning` and the artifact path must
`gl-container-scanning-report.json`
.
[
Learn more on container scanning results shown in merge requests
](
https://docs.gitlab.com/ee/user/project/merge_requests/container_scanning.html
)
.
>**Note
:**
CAUTION:
**Caution
:**
Container Scanning was previously using
`sast:container`
for job name and
`gl-sast-container-report.json`
for the artifact name. While these old names
are still maintained they have been deprecated with GitLab 11.0 and may be removed
in next major release. You are advised to update your current
`.gitlab-ci.yml`
in next major release
, GitLab 12.0
. You are advised to update your current
`.gitlab-ci.yml`
configuration to reflect that change.
[
ee
]:
https://about.gitlab.com/products/
doc/user/project/merge_requests/container_scanning.md
View file @
4f4c8a49
...
...
@@ -33,11 +33,11 @@ GitLab will then check this file and show the information inside the merge reque
For more information on how the
`container_scanning`
job should look like, check the
example on
[
analyzing a Docker image for vulnerabilities
][
cc-docs
]
.
>**Note
:**
CAUTION:
**Caution
:**
Container Scanning was previously using
`sast:container`
for job name and
`gl-sast-container-report.json`
for the artifact name. While these old names
are still maintained they have been deprecated with GitLab 11.0 and may be removed
in next major release. You are advised to update your current
`.gitlab-ci.yml`
in next major release
, GitLab 12.0
. You are advised to update your current
`.gitlab-ci.yml`
configuration to reflect that change.
[
ee-3672
]:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3672
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment