Skip to content

Commit

Permalink
Merge pull request #76 from arminc/wheezy
Browse files Browse the repository at this point in the history
Debian wheezy is not supported any more, using jessie
  • Loading branch information
arminc authored May 12, 2019
2 parents 2ded359 + 2bc183a commit b859564
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
10 changes: 3 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,15 @@ test:
pull:
docker pull alpine:3.5

dbosx:
docker run -p 5432:5432 -d --name db arminc/clair-db:$(shell date -v-1d +%Y-%m-%d)
@sleep 5

db:
docker run -p 5432:5432 -d --name db arminc/clair-db:$(shell date -d "-1 day" +%Y-%m-%d)
docker run -p 5432:5432 -d --name db arminc/clair-db:latest
@sleep 5

clair:
docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.6
docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:latest
@sleep 5

integration: pull dbosx clair
integration: pull db clair
go test -v -covermode=count -coverprofile=coverage.out -ip $(shell ipconfig getifaddr en0) -tags integration

integrationlinux: pull db clair
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:wheezy
FROM debian:jessie

RUN apt-get update -y && apt-get install --no-install-recommends -y -q \
curl \
Expand Down
2 changes: 1 addition & 1 deletion integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func TestMain(m *testing.M) {
func TestDebian(t *testing.T) {
initializeLogger("")
unapproved := scan(scannerConfig{
"debian:wheezy",
"debian:jessie",
vulnerabilitiesWhitelist{},
"http://127.0.0.1:6060",
*ip,
Expand Down

0 comments on commit b859564

Please sign in to comment.