Skip to content

Commit 6d1bae4

Browse files
ACP-20140 - Update alpine image from 3.19 to 3.20 (UKHomeOffice#82)
* Update alpine image from 3.19 to 3.20 * update the alpine image to 3.20.2 * add line to Dockerfile RUN apk update && apk upgrade --no-cache for Clamav * add Vulnerability to .trivyignore * change SUPERCRONIC_URL ENV * add CVE-2024-24791 to .trivyignore * add empty line to .trivyignore file --------- Co-authored-by: humayun-alam <[email protected]>
1 parent 46ab50a commit 6d1bae4

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.trivyignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
# Fix for these CVEs are in edge tag, will wait until LTS
22
CVE-2024-0853
3-
CVE-2024-25062
3+
CVE-2024-25062
4+
CVE-2023-42364
5+
CVE-2023-42365
6+
CVE-2024-24791

clamav-http/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY server/ ./server/
99
RUN CGO_ENABLED=0 GOOS=linux go install -v \
1010
github.com/ukhomeoffice/clamav-http/clamav-http
1111

12-
FROM alpine:3.19
12+
FROM alpine:3.20.2
1313
RUN apk --no-cache add ca-certificates
1414

1515
RUN addgroup -g 1000 -S app && \

clamav-mirror/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM python:3.11-alpine3.19
1+
FROM python:3.11-alpine3.20
22

33
ENV CLAM_VERSION=1.2.2-r0
4-
ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.26/supercronic-linux-amd64 \
4+
ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.30/supercronic-linux-amd64 \
55
SUPERCRONIC=supercronic-linux-amd64 \
6-
SUPERCRONIC_SHA1SUM=7a79496cf8ad899b99a719355d4db27422396735
6+
SUPERCRONIC_SHA1SUM=9f27ad28c5c57cd133325b2a66bba69ba2235799
77

88
WORKDIR /clam
99

clamav/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.19
1+
FROM alpine:3.20.2
22

33
ENV CLAM_VERSION=1.2.2-r0
44

@@ -7,6 +7,8 @@ WORKDIR /clam
77
# Add edge repository
88
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
99

10+
RUN apk update && apk upgrade --no-cache
11+
1012
RUN apk add --no-cache bash clamav=$CLAM_VERSION clamav-libunrar=$CLAM_VERSION
1113

1214
RUN apk add --no-cache --upgrade openssl

0 commit comments

Comments
 (0)