Skip to content

Commit 29f0347

Browse files
authored
fix(os): Add photon 5.0 in supported OS (#9724)
1 parent 212f078 commit 29f0347

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

docs/docs/coverage/os/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Trivy supports operating systems for
2727
| [openSUSE Tumbleweed](suse.md) | (n/a) | zypper/rpm |
2828
| [SUSE Linux Enterprise](suse.md) | 11, 12, 15 | zypper/rpm |
2929
| [SUSE Linux Enterprise Micro](suse.md) | 5, 6 | zypper/rpm |
30-
| [Photon OS](photon.md) | 1.0, 2.0, 3.0, 4.0 | tndf/yum/rpm |
30+
| [Photon OS](photon.md) | 1.0, 2.0, 3.0, 4.0, 5.0 | tndf/yum/rpm |
3131
| [CoreOS](coreos.md)[^3] | All versions (SBOM only) | rpm |
3232
| [Echo](echo.md) | (n/a) | apt/dpkg |
3333
| [Debian GNU/Linux](debian.md) | 7, 8, 9, 10, 11, 12 | apt/dpkg |

pkg/detector/ospkg/photon/photon.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ var (
2020
eolDates = map[string]time.Time{
2121
"1.0": time.Date(2022, 2, 28, 23, 59, 59, 0, time.UTC),
2222
"2.0": time.Date(2022, 12, 31, 23, 59, 59, 0, time.UTC),
23-
// The following versions don't have the EOL dates yet.
24-
// See https://blogs.vmware.com/vsphere/2022/01/photon-1-x-end-of-support-announcement.html
25-
"3.0": time.Date(2024, 6, 30, 23, 59, 59, 0, time.UTC),
26-
"4.0": time.Date(2025, 12, 31, 23, 59, 59, 0, time.UTC),
23+
"3.0": time.Date(2024, 3, 31, 23, 59, 59, 0, time.UTC),
24+
"4.0": time.Date(2026, 3, 31, 23, 59, 59, 0, time.UTC),
25+
// The following version don't have the EOL dates yet.
26+
// https://blogs.vmware.com/cloud-foundation/2023/05/02/announcing-photon-os-5-0-general-availability/
27+
"5.0": time.Date(3000, 1, 1, 23, 59, 59, 0, time.UTC),
2728
}
2829
)
2930

0 commit comments

Comments
 (0)