diff --git a/Makefile b/Makefile index fa5375020f2..a2f3c28d192 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ VINEYARDRUNTIME_BINARY ?= bin/vineyardruntime-controller WEBHOOK_BINARY ?= bin/fluid-webhook # Miscellaneous -HELM_VERSION ?= helm-v3.11.3 +HELM_VERSION ?= helm-v3.17.3 CRD_OPTIONS ?= "crd" # Build binaries diff --git a/docker/Dockerfile.alluxioruntime b/docker/Dockerfile.alluxioruntime index 4bd24ba49a7..c0389e95533 100644 --- a/docker/Dockerfile.alluxioruntime +++ b/docker/Dockerfile.alluxioruntime @@ -8,8 +8,8 @@ COPY . . RUN make alluxioruntime-controller-build && \ cp bin/alluxioruntime-controller /go/bin/alluxioruntime-controller -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \ rm -rf /var/cache/apk/* && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ diff --git a/docker/Dockerfile.application b/docker/Dockerfile.application index e52d2befee1..735ee867b6b 100644 --- a/docker/Dockerfile.application +++ b/docker/Dockerfile.application @@ -11,8 +11,8 @@ RUN make application-controller-build && \ # Debug #RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2 -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \ rm -rf /var/cache/apk/* && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ diff --git a/docker/Dockerfile.crds b/docker/Dockerfile.crds index 4ba70c84ab5..03c07b604c0 100644 --- a/docker/Dockerfile.crds +++ b/docker/Dockerfile.crds @@ -1,5 +1,5 @@ -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b COPY ./charts/fluid/fluid/crds /fluid/crds COPY ./tools/crd-upgrade/upgrade-crds.sh /fluid/upgrade-crds.sh diff --git a/docker/Dockerfile.csi b/docker/Dockerfile.csi index 15521e441c2..498ffa8f639 100644 --- a/docker/Dockerfile.csi +++ b/docker/Dockerfile.csi @@ -18,8 +18,8 @@ RUN make csi-build && \ # Use distroless as minimal base image to package the csi binary # Refer to https://github.com/GoogleContainerTools/distroless for more details -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \ rm -rf /var/cache/apk/* && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ diff --git a/docker/Dockerfile.dataset b/docker/Dockerfile.dataset index 4716ddfa644..9652f45e7fa 100644 --- a/docker/Dockerfile.dataset +++ b/docker/Dockerfile.dataset @@ -11,8 +11,8 @@ RUN make dataset-controller-build && \ # Debug # RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2 -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \ rm -rf /var/cache/apk/* && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ diff --git a/docker/Dockerfile.efcruntime b/docker/Dockerfile.efcruntime index 7b0f7884443..bb40f345874 100644 --- a/docker/Dockerfile.efcruntime +++ b/docker/Dockerfile.efcruntime @@ -11,8 +11,8 @@ RUN make efcruntime-controller-build && \ # Debug #RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2 -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \ rm -rf /var/cache/apk/* && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ diff --git a/docker/Dockerfile.goosefsruntime b/docker/Dockerfile.goosefsruntime index 7f14c93089c..db08f8b2605 100644 --- a/docker/Dockerfile.goosefsruntime +++ b/docker/Dockerfile.goosefsruntime @@ -11,8 +11,8 @@ RUN make goosefsruntime-controller-build && \ # Debug RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2 -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \ rm -rf /var/cache/apk/* && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ diff --git a/docker/Dockerfile.jindoruntime b/docker/Dockerfile.jindoruntime index 1d5dfa7f2ba..fac39dd96c9 100644 --- a/docker/Dockerfile.jindoruntime +++ b/docker/Dockerfile.jindoruntime @@ -8,8 +8,8 @@ COPY . . RUN make jindoruntime-controller-build && \ cp bin/jindoruntime-controller /go/bin/jindoruntime-controller -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \ rm -rf /var/cache/apk/* && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ diff --git a/docker/Dockerfile.juicefsruntime b/docker/Dockerfile.juicefsruntime index 4e0b26e40bc..4ad1d4859a1 100644 --- a/docker/Dockerfile.juicefsruntime +++ b/docker/Dockerfile.juicefsruntime @@ -11,8 +11,8 @@ RUN make juicefsruntime-controller-build && \ # Debug #RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2 -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \ rm -rf /var/cache/apk/* && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ diff --git a/docker/Dockerfile.thinruntime b/docker/Dockerfile.thinruntime index 737bd2029a4..53ab08a1f3a 100644 --- a/docker/Dockerfile.thinruntime +++ b/docker/Dockerfile.thinruntime @@ -11,8 +11,8 @@ RUN make thinruntime-controller-build && \ # Debug #RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2 -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \ rm -rf /var/cache/apk/* && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ diff --git a/docker/Dockerfile.vineyardruntime b/docker/Dockerfile.vineyardruntime index 4a6437b83d7..201b2d612cd 100644 --- a/docker/Dockerfile.vineyardruntime +++ b/docker/Dockerfile.vineyardruntime @@ -8,8 +8,8 @@ COPY . . RUN make vineyardruntime-controller-build && \ cp bin/vineyardruntime-controller /go/bin/vineyardruntime-controller -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \ rm -rf /var/cache/apk/* && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ diff --git a/docker/Dockerfile.webhook b/docker/Dockerfile.webhook index 2a0aed2870a..b7391a06388 100644 --- a/docker/Dockerfile.webhook +++ b/docker/Dockerfile.webhook @@ -11,8 +11,8 @@ RUN make webhook-build && \ # Debug #RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2 -# alpine:3.18 -FROM alpine@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 +# alpine:3.19.1 +FROM alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \ rm -rf /var/cache/apk/* && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \