diff --git a/Dockerfile b/Dockerfile index a44ecdd0..1bce2a9a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV REPOSITORY github.com/future-architect/vuls COPY . $GOPATH/src/$REPOSITORY RUN cd $GOPATH/src/$REPOSITORY && make install -FROM alpine:3.15 +FROM alpine:3.16 ENV LOGDIR /var/log/vuls ENV WORKDIR /vuls diff --git a/config/os.go b/config/os.go index 54ec2abe..ff366fec 100644 --- a/config/os.go +++ b/config/os.go @@ -257,6 +257,7 @@ func GetEOL(family, release string) (eol EOL, found bool) { "3.13": {StandardSupportUntil: time.Date(2022, 11, 1, 23, 59, 59, 0, time.UTC)}, "3.14": {StandardSupportUntil: time.Date(2023, 5, 1, 23, 59, 59, 0, time.UTC)}, "3.15": {StandardSupportUntil: time.Date(2023, 11, 1, 23, 59, 59, 0, time.UTC)}, + "3.16": {StandardSupportUntil: time.Date(2024, 5, 23, 23, 59, 59, 0, time.UTC)}, }[majorDotMinor(release)] case constant.FreeBSD: // https://www.freebsd.org/security/ diff --git a/config/os_test.go b/config/os_test.go index efee4379..875013d3 100644 --- a/config/os_test.go +++ b/config/os_test.go @@ -406,8 +406,16 @@ func TestEOL_IsStandardSupportEnded(t *testing.T) { found: true, }, { - name: "Alpine 3.16 not found", + name: "Alpine 3.16 supported", fields: fields{family: Alpine, release: "3.16"}, + now: time.Date(2024, 5, 23, 23, 59, 59, 0, time.UTC), + stdEnded: false, + extEnded: false, + found: true, + }, + { + name: "Alpine 3.17 not found", + fields: fields{family: Alpine, release: "3.17"}, now: time.Date(2022, 1, 14, 23, 59, 59, 0, time.UTC), stdEnded: false, extEnded: false,