Skip to content

Add alpine 3.14 support #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RTann merged 3 commits into from
Jun 24, 2021
Merged

Add alpine 3.14 support #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af0fcc7
support 3.14
RTann Jun 21, 2021
63dcf86
ensure we can scan alpinr:3.14
RTann Jun 24, 2021
5fa93e8
remove addedby
RTann Jun 24, 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
19 changes: 19 additions & 0 deletions e2etests/sanity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1827,6 +1827,25 @@ func TestImageSanity(t *testing.T) {
},
},
},
{
image: "alpine:3.14.0",
registry: "https://registry-1.docker.io",
source: "NVD",
username: os.Getenv("DOCKER_IO_PULL_USERNAME"),
password: os.Getenv("DOCKER_IO_PULL_PASSWORD"),
expectedFeatures: []v1.Feature{
{
Name: "apk-tools",
VersionFormat: "apk",
Version: "2.12.5-r1",
},
{
Name: "busybox",
VersionFormat: "apk",
Version: "1.33.1-r2",
},
},
},
} {
t.Run(testCase.image, func(t *testing.T) {
verifyImageHasExpectedFeatures(t, cli, testCase.username, testCase.password, testCase.source, &types.ImageRequest{Image: testCase.image, Registry: testCase.registry, UncertifiedRHELScan: testCase.uncertifiedRHEL}, testCase.checkContainsOnly, testCase.expectedFeatures, testCase.unexpectedFeatures)
Expand Down
13 changes: 7 additions & 6 deletions pkg/wellknownnamespaces/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ import "github.com/stackrox/rox/pkg/set"
var (
// KnownStaleNamespaces is the set of base namespaces we know have stale vulnerabilities.
KnownStaleNamespaces = set.NewFrozenStringSet(
"alpine:v3.2",
"alpine:v3.3",
"alpine:v3.4",
"alpine:v3.5",
"alpine:v3.6",
"alpine:v3.7",
"debian:8",
"oracle:5",
"ubuntu:12.10",
Expand All @@ -30,12 +24,19 @@ var (
// If you add a new Debian or Ubuntu version, be sure to add it to
// database/namespace_mapping.go as well.
KnownSupportedNamespaces = set.NewFrozenStringSet(
"alpine:v3.2",
"alpine:v3.3",
"alpine:v3.4",
"alpine:v3.5",
"alpine:v3.6",
"alpine:v3.7",
"alpine:v3.8",
"alpine:v3.9",
"alpine:v3.10",
"alpine:v3.11",
"alpine:v3.12",
"alpine:v3.13",
"alpine:v3.14",
"alpine:edge",
"amzn:2018.03",
"amzn:2",
Expand Down