Skip to content

Commit a33a67e

Browse files
authored
ROX-19096, ROX-19098, ROX-19099: add various OS support (#1235)
1 parent 7c817a3 commit a33a67e

File tree

3 files changed

+79
-4
lines changed

3 files changed

+79
-4
lines changed

database/namespace_mapping.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ var DebianReleasesMapping = map[string]string{
2626
"buster": "10",
2727
"bullseye": "11",
2828
"bookworm": "12",
29+
"trixie": "13",
2930
"sid": "unstable",
3031

3132
// Class names
32-
"oldoldstable": "9",
33-
"oldstable": "10",
34-
"stable": "11",
35-
"testing": "12",
33+
"oldoldstable": "10",
34+
"oldstable": "11",
35+
"stable": "12",
36+
"testing": "13",
3637
"unstable": "unstable",
3738
}
3839

@@ -62,4 +63,6 @@ var UbuntuReleasesMapping = map[string]string{
6263
"impish": "21.10",
6364
"jammy": "22.04",
6465
"kinetic": "22.10",
66+
"lunar": "23.04",
67+
"mantic": "23.10",
6568
}

e2etests/testcase_test.go

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4084,4 +4084,72 @@ All OpenShift Container Platform 4.10 users are advised to upgrade to these upda
40844084
},
40854085
},
40864086
},
4087+
{
4088+
image: "alpine:3.18.3",
4089+
registry: "https://registry-1.docker.io",
4090+
source: "NVD",
4091+
onlyCheckSpecifiedVulns: true,
4092+
namespace: "alpine:v3.18",
4093+
expectedFeatures: []apiV1.Feature{
4094+
{
4095+
Name: "apk-tools",
4096+
NamespaceName: "alpine:v3.18",
4097+
VersionFormat: "apk",
4098+
Version: "2.14.0-r2",
4099+
AddedBy: "sha256:7264a8db6415046d36d16ba98b79778e18accee6ffa71850405994cffa9be7de",
4100+
},
4101+
},
4102+
},
4103+
{
4104+
image: "debian:12.0",
4105+
registry: "https://registry-1.docker.io",
4106+
source: "NVD",
4107+
onlyCheckSpecifiedVulns: true,
4108+
namespace: "debian:12",
4109+
expectedFeatures: []apiV1.Feature{
4110+
{
4111+
Name: "base-files",
4112+
NamespaceName: "debian:12",
4113+
VersionFormat: "dpkg",
4114+
Version: "12.4",
4115+
AddedBy: "sha256:d52e4f012db158bb7c0fe215b98af1facaddcbaee530efd69b1bae07d597b711",
4116+
},
4117+
},
4118+
},
4119+
{
4120+
image: "quay.io/rhacs-eng/qa:ubuntu-23.04",
4121+
registry: "https://quay.io",
4122+
username: os.Getenv("QUAY_RHACS_ENG_RO_USERNAME"),
4123+
password: os.Getenv("QUAY_RHACS_ENG_RO_PASSWORD"),
4124+
source: "NVD",
4125+
onlyCheckSpecifiedVulns: true,
4126+
namespace: "ubuntu:23.04",
4127+
expectedFeatures: []apiV1.Feature{
4128+
{
4129+
Name: "base-files",
4130+
NamespaceName: "ubuntu:23.04",
4131+
VersionFormat: "dpkg",
4132+
Version: "12.3ubuntu2",
4133+
AddedBy: "sha256:b631a20f124dbf4ef89945623fa5c94460561f9c7b119e17fd3c1a4bb50ced01",
4134+
},
4135+
},
4136+
},
4137+
{
4138+
image: "quay.io/rhacs-eng/qa:ubuntu-23.10",
4139+
registry: "https://quay.io",
4140+
source: "NVD",
4141+
username: os.Getenv("QUAY_RHACS_ENG_RO_USERNAME"),
4142+
password: os.Getenv("QUAY_RHACS_ENG_RO_PASSWORD"),
4143+
onlyCheckSpecifiedVulns: true,
4144+
namespace: "ubuntu:23.10",
4145+
expectedFeatures: []apiV1.Feature{
4146+
{
4147+
Name: "base-files",
4148+
NamespaceName: "ubuntu:23.10",
4149+
VersionFormat: "dpkg",
4150+
Version: "13ubuntu1",
4151+
AddedBy: "sha256:316675922a661ce4c35389bdeea6e9ec8d4708e41f08671b586c7aaea469b2c1",
4152+
},
4153+
},
4154+
},
40874155
}

pkg/wellknownnamespaces/set.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ var (
4646
"alpine:v3.15",
4747
"alpine:v3.16",
4848
"alpine:v3.17",
49+
"alpine:v3.18",
4950
"alpine:edge",
5051
"amzn:2018.03",
5152
"amzn:2",
@@ -54,6 +55,7 @@ var (
5455
"centos:8",
5556
"debian:10",
5657
"debian:11",
58+
"debian:12",
5759
"debian:unstable",
5860
"rhel:6",
5961
"rhel:7",
@@ -65,5 +67,7 @@ var (
6567
"ubuntu:20.04",
6668
"ubuntu:22.04",
6769
"ubuntu:22.10",
70+
"ubuntu:23.04",
71+
"ubuntu:23.10",
6872
)
6973
)

0 commit comments

Comments
 (0)