Skip to content

Commit 1208686

Browse files
authored
Add alpine 3.14 support (#410)
1 parent cc4885a commit 1208686

File tree

2 files changed

+26
-6
lines changed

2 files changed

+26
-6
lines changed

e2etests/sanity_test.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,6 +1827,25 @@ func TestImageSanity(t *testing.T) {
18271827
},
18281828
},
18291829
},
1830+
{
1831+
image: "alpine:3.14.0",
1832+
registry: "https://registry-1.docker.io",
1833+
source: "NVD",
1834+
username: os.Getenv("DOCKER_IO_PULL_USERNAME"),
1835+
password: os.Getenv("DOCKER_IO_PULL_PASSWORD"),
1836+
expectedFeatures: []v1.Feature{
1837+
{
1838+
Name: "apk-tools",
1839+
VersionFormat: "apk",
1840+
Version: "2.12.5-r1",
1841+
},
1842+
{
1843+
Name: "busybox",
1844+
VersionFormat: "apk",
1845+
Version: "1.33.1-r2",
1846+
},
1847+
},
1848+
},
18301849
} {
18311850
t.Run(testCase.image, func(t *testing.T) {
18321851
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)

pkg/wellknownnamespaces/set.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ import "github.com/stackrox/rox/pkg/set"
55
var (
66
// KnownStaleNamespaces is the set of base namespaces we know have stale vulnerabilities.
77
KnownStaleNamespaces = set.NewFrozenStringSet(
8-
"alpine:v3.2",
9-
"alpine:v3.3",
10-
"alpine:v3.4",
11-
"alpine:v3.5",
12-
"alpine:v3.6",
13-
"alpine:v3.7",
148
"debian:8",
159
"oracle:5",
1610
"ubuntu:12.10",
@@ -30,12 +24,19 @@ var (
3024
// If you add a new Debian or Ubuntu version, be sure to add it to
3125
// database/namespace_mapping.go as well.
3226
KnownSupportedNamespaces = set.NewFrozenStringSet(
27+
"alpine:v3.2",
28+
"alpine:v3.3",
29+
"alpine:v3.4",
30+
"alpine:v3.5",
31+
"alpine:v3.6",
32+
"alpine:v3.7",
3333
"alpine:v3.8",
3434
"alpine:v3.9",
3535
"alpine:v3.10",
3636
"alpine:v3.11",
3737
"alpine:v3.12",
3838
"alpine:v3.13",
39+
"alpine:v3.14",
3940
"alpine:edge",
4041
"amzn:2018.03",
4142
"amzn:2",

0 commit comments

Comments
 (0)