Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Duncan Macleod
base
Commits
f6684179
Unverified
Commit
f6684179
authored
11 months ago
by
Duncan Macleod
Browse files
Options
Downloads
Patches
Plain Diff
ci: fix container scanning
parent
18df101b
Branches
el8-htcondor-stable
No related tags found
No related merge requests found
Pipeline
#609451
passed
11 months ago
Stage: build
Stage: scan
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
.gitlab/ci/build.yml
+0
-12
0 additions, 12 deletions
.gitlab/ci/build.yml
.gitlab/ci/scan.yml
+21
-0
21 additions, 0 deletions
.gitlab/ci/scan.yml
with
23 additions
and
12 deletions
.gitlab-ci.yml
+
2
−
0
View file @
f6684179
...
...
@@ -7,5 +7,7 @@ stages:
include
:
# build and publish _this_ image
-
local
:
'
.gitlab/ci/build.yml'
# scan the image for vulnerabilities
-
local
:
'
.gitlab/ci/scan.yml'
# trigger rebuilds of downstream images
-
local
:
'
.gitlab/ci/trigger.yml'
This diff is collapsed.
Click to expand it.
.gitlab/ci/build.yml
+
0
−
12
View file @
f6684179
...
...
@@ -7,8 +7,6 @@ include:
-
project
:
computing/gitlab-ci-templates
# https://computing.docs.ligo.org/gitlab-ci-templates/docker/
file
:
docker.yml
# https://docs.gitlab.com/ee/user/application_security/container_scanning/
-
template
:
Security/Container-Scanning.gitlab-ci.yml
# -- build the image --------
...
...
@@ -21,16 +19,6 @@ build:
# use the branch name as the tag
CI_REGISTRY_TAG
:
'
$CI_COMMIT_REF_SLUG'
# -- scan the image ---------
# check the image for vulnerabilities, see
# https://docs.gitlab.com/ee/user/application_security/container_scanning/
container_scanning
:
stage
:
scan
needs
:
[
build
]
variables
:
DOCKER_IMAGE
:
'
$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG'
# -- push the image ---------
.push
:
...
...
This diff is collapsed.
Click to expand it.
.gitlab/ci/scan.yml
0 → 100644
+
21
−
0
View file @
f6684179
# ---------------------------
# Build workflow
# ---------------------------
include
:
# https://docs.gitlab.com/ee/user/application_security/container_scanning/
-
template
:
Security/Container-Scanning.gitlab-ci.yml
# -- scan the image ---------
# check the image for vulnerabilities, see
# https://docs.gitlab.com/ee/user/application_security/container_scanning/
container_scanning
:
stage
:
scan
needs
:
[
build
]
variables
:
# use upstream project for default image
CS_DEFAULT_BRANCH_IMAGE
:
"
$CI_REGISTRY/docker/$CI_PROJECT_NAME:$CI_COMMIT_REF_SLUG"
# this is the current image
CS_IMAGE
:
"
$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
GIT_STRATEGY
:
fetch
This diff is collapsed.
Click to expand it.
Duncan Macleod
@duncanmmacleod
mentioned in commit
2cb5da50
·
11 months ago
mentioned in commit
2cb5da50
mentioned in commit 2cb5da50990398101809e3cb2b13108808776a66
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment