Skip to content

Commit f20e1cf

Browse files
Syspretor玖宇
andauthored
fix security issue in current helm and alpine version (#4839)
Signed-off-by: 玖宇 <guotongyu.gty@alibaba-inc.com> Co-authored-by: 玖宇 <guotongyu.gty@alibaba-inc.com>
1 parent 0d1a527 commit f20e1cf

13 files changed

Lines changed: 25 additions & 25 deletions

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ VINEYARDRUNTIME_BINARY ?= bin/vineyardruntime-controller
7474
WEBHOOK_BINARY ?= bin/fluid-webhook
7575

7676
# Miscellaneous
77-
HELM_VERSION ?= helm-v3.11.3
77+
HELM_VERSION ?= helm-v3.17.3
7878
CRD_OPTIONS ?= "crd"
7979

8080
# Build binaries

docker/Dockerfile.alluxioruntime

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ COPY . .
88
RUN make alluxioruntime-controller-build && \
99
cp bin/alluxioruntime-controller /go/bin/alluxioruntime-controller
1010

11-
# alpine:3.18
12-
FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160
11+
# alpine:3.19.1
12+
FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b
1313
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
1414
rm -rf /var/cache/apk/* && \
1515
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \

docker/Dockerfile.application

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ RUN make application-controller-build && \
1111
# Debug
1212
#RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
1313

14-
# alpine:3.18
15-
FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160
14+
# alpine:3.19.1
15+
FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b
1616
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
1717
rm -rf /var/cache/apk/* && \
1818
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \

docker/Dockerfile.crds

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# alpine:3.18
2-
FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160
1+
# alpine:3.19.1
2+
FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b
33

44
COPY ./charts/fluid/fluid/crds /fluid/crds
55
COPY ./tools/crd-upgrade/upgrade-crds.sh /fluid/upgrade-crds.sh

docker/Dockerfile.csi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ RUN make csi-build && \
1818

1919
# Use distroless as minimal base image to package the csi binary
2020
# Refer to https://github.com/GoogleContainerTools/distroless for more details
21-
# alpine:3.18
22-
FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160
21+
# alpine:3.19.1
22+
FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b
2323
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
2424
rm -rf /var/cache/apk/* && \
2525
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \

docker/Dockerfile.dataset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ RUN make dataset-controller-build && \
1111
# Debug
1212
# RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
1313

14-
# alpine:3.18
15-
FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160
14+
# alpine:3.19.1
15+
FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b
1616
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
1717
rm -rf /var/cache/apk/* && \
1818
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \

docker/Dockerfile.efcruntime

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ RUN make efcruntime-controller-build && \
1111
# Debug
1212
#RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
1313

14-
# alpine:3.18
15-
FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160
14+
# alpine:3.19.1
15+
FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b
1616
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
1717
rm -rf /var/cache/apk/* && \
1818
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \

docker/Dockerfile.goosefsruntime

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ RUN make goosefsruntime-controller-build && \
1111
# Debug
1212
RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
1313

14-
# alpine:3.18
15-
FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160
14+
# alpine:3.19.1
15+
FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b
1616
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
1717
rm -rf /var/cache/apk/* && \
1818
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \

docker/Dockerfile.jindoruntime

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ COPY . .
88
RUN make jindoruntime-controller-build && \
99
cp bin/jindoruntime-controller /go/bin/jindoruntime-controller
1010

11-
# alpine:3.18
12-
FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160
11+
# alpine:3.19.1
12+
FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b
1313
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
1414
rm -rf /var/cache/apk/* && \
1515
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \

docker/Dockerfile.juicefsruntime

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ RUN make juicefsruntime-controller-build && \
1111
# Debug
1212
#RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
1313

14-
# alpine:3.18
15-
FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160
14+
# alpine:3.19.1
15+
FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b
1616
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
1717
rm -rf /var/cache/apk/* && \
1818
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \

0 commit comments

Comments
 (0)