Skip to content
Jump to bottom

update clair scan #97

Merged
merged 2 commits into from
Jun 14, 2021
Merged

update clair scan #97

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64d9376
ensure cached clair containers aren't used for scanning
pcaskey Jun 14, 2021
0e519ce
add 'pull always' to clair commands
pcaskey Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions tests/clairscan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ if [ $? == "0" ]; then
echo 'removing existing clair-db container...'
docker kill db &>/dev/null
docker rm db &>/dev/null
docker run -p 5432:5432 -d --name db arminc/clair-db:latest &>/dev/null
docker run --pull always --rm -p 5432:5432 -d --name db arminc/clair-db:latest &>/dev/null
else
docker run -p 5432:5432 -d --name db arminc/clair-db:latest &>/dev/null
docker run --pull always --rm -p 5432:5432 -d --name db arminc/clair-db:latest &>/dev/null
fi
sleep 30

Expand All @@ -42,9 +42,13 @@ if [ $? == "0" ]; then
echo 'removing existing clair-scan container...'
docker kill clair &>/dev/null
docker rm clair &>/dev/null
docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:latest &>/dev/null
docker run --pull always --rm -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:latest &>/dev/null
#for docker versions prior to 20.10:
#docker run --rm -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:latest &>/dev/null
else
docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:latest &>/dev/null
docker run --pull always --rm -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:latest &>/dev/null
#for docker versions prior to 20.10:
#docker run --rm -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:latest &>/dev/null
fi
sleep 60

Expand Down