Skip to content

Commit 6ab8fa9

Browse files
Syspretor玖宇
Syspretor
and
玖宇
authored
import self-maintainerd ddc-helm in dockerfile (#5164)
Signed-off-by: 玖宇 <guotongyu.gty@alibaba-inc.com> Co-authored-by: 玖宇 <guotongyu.gty@alibaba-inc.com>
1 parent 3ad670b commit 6ab8fa9

10 files changed

Lines changed: 30 additions & 29 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.17.3
77+
HELM_VERSION ?= v3.17.3
7878
CRD_OPTIONS ?= "crd"
7979

8080
# Build binaries

‎docker/Dockerfile.alluxioruntime‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ RUN make alluxioruntime-controller-build && \
1010

1111
# alpine:3.20.6
1212
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
13-
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
13+
RUN apk add --update bash curl wget iproute2 libc6-compat tzdata vim && \
1414
rm -rf /var/cache/apk/* && \
1515
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1616
echo "Asia/Shanghai" > /etc/timezone
1717

1818
ARG TARGETARCH
1919
ARG HELM_VERSION
20-
RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
21-
tar -xvf ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
20+
RUN wget -O helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://github.com/fluid-cloudnative/helm/releases/download/${HELM_VERSION}/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
21+
tar -xvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
2222
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
2323
chmod u+x /usr/local/bin/ddc-helm && \
2424
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz

‎docker/Dockerfile.application‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@ RUN make application-controller-build && \
1010

1111
# Debug
1212
#RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
13-
1413
# alpine:3.20.6
1514
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
16-
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
15+
RUN apk add --update bash curl wget iproute2 libc6-compat tzdata vim && \
1716
rm -rf /var/cache/apk/* && \
1817
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1918
echo "Asia/Shanghai" > /etc/timezone
2019

2120
ARG TARGETARCH
2221
ARG HELM_VERSION
23-
RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
24-
tar -xvf ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
22+
RUN wget -O helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://github.com/fluid-cloudnative/helm/releases/download/${HELM_VERSION}/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
23+
tar -xvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
2524
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
2625
chmod u+x /usr/local/bin/ddc-helm && \
2726
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz

‎docker/Dockerfile.dataset‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ RUN make dataset-controller-build && \
1313

1414
# alpine:3.20.6
1515
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
16-
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
16+
RUN apk add --update bash curl wget iproute2 libc6-compat tzdata vim && \
1717
rm -rf /var/cache/apk/* && \
1818
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1919
echo "Asia/Shanghai" > /etc/timezone
2020

2121
ARG TARGETARCH
2222
ARG HELM_VERSION
23-
RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
24-
tar -xvf ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
23+
RUN wget -O helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://github.com/fluid-cloudnative/helm/releases/download/${HELM_VERSION}/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
24+
tar -xvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
2525
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
2626
chmod u+x /usr/local/bin/ddc-helm && \
2727
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz

‎docker/Dockerfile.efcruntime‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ RUN make efcruntime-controller-build && \
1313

1414
# alpine:3.20.6
1515
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
16-
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
16+
RUN apk add --update bash curl wget iproute2 libc6-compat tzdata vim && \
1717
rm -rf /var/cache/apk/* && \
1818
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1919
echo "Asia/Shanghai" > /etc/timezone
2020

2121
ARG TARGETARCH
2222
ARG HELM_VERSION
23-
RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
24-
tar -xvf ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
23+
RUN wget -O helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://github.com/fluid-cloudnative/helm/releases/download/${HELM_VERSION}/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
24+
tar -xvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
2525
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
2626
chmod u+x /usr/local/bin/ddc-helm && \
2727
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz

‎docker/Dockerfile.goosefsruntime‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
1313

1414
# alpine:3.20.6
1515
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
16-
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
16+
RUN apk add --update bash curl wget iproute2 libc6-compat tzdata vim && \
1717
rm -rf /var/cache/apk/* && \
1818
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1919
echo "Asia/Shanghai" > /etc/timezone
2020

2121
ARG TARGETARCH
2222
ARG HELM_VERSION
23-
RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
24-
tar -xvf ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
23+
RUN wget -O helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://github.com/fluid-cloudnative/helm/releases/download/${HELM_VERSION}/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
24+
tar -xvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
2525
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
2626
chmod u+x /usr/local/bin/ddc-helm && \
2727
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz

‎docker/Dockerfile.jindoruntime‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ RUN make jindoruntime-controller-build && \
1010

1111
# alpine:3.20.6
1212
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
13-
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
13+
RUN apk add --update bash curl wget iproute2 libc6-compat tzdata vim && \
1414
rm -rf /var/cache/apk/* && \
1515
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1616
echo "Asia/Shanghai" > /etc/timezone
1717

1818
ARG TARGETARCH
1919
ARG HELM_VERSION
20-
RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
21-
tar -xvf ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
20+
RUN wget -O helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://github.com/fluid-cloudnative/helm/releases/download/${HELM_VERSION}/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
21+
tar -xvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
2222
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
2323
chmod u+x /usr/local/bin/ddc-helm && \
2424
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz

‎docker/Dockerfile.juicefsruntime‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@ RUN make juicefsruntime-controller-build && \
1313

1414
# alpine:3.20.6
1515
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
16-
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
16+
RUN apk add --update bash curl wget iproute2 libc6-compat tzdata vim && \
1717
rm -rf /var/cache/apk/* && \
1818
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1919
echo "Asia/Shanghai" > /etc/timezone
2020

21+
22+
2123
ARG TARGETARCH
2224
ARG HELM_VERSION
23-
RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
24-
tar -xvf ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
25+
RUN wget -O helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://github.com/fluid-cloudnative/helm/releases/download/${HELM_VERSION}/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
26+
tar -xvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
2527
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
2628
chmod u+x /usr/local/bin/ddc-helm && \
2729
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz

‎docker/Dockerfile.thinruntime‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ RUN make thinruntime-controller-build && \
1313

1414
# alpine:3.20.6
1515
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
16-
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
16+
RUN apk add --update bash curl wget iproute2 libc6-compat tzdata vim && \
1717
rm -rf /var/cache/apk/* && \
1818
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1919
echo "Asia/Shanghai" > /etc/timezone
2020

2121
ARG TARGETARCH
2222
ARG HELM_VERSION
23-
RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
24-
tar -xvf ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
23+
RUN wget -O helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://github.com/fluid-cloudnative/helm/releases/download/${HELM_VERSION}/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
24+
tar -xvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
2525
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
2626
chmod u+x /usr/local/bin/ddc-helm && \
2727
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz

‎docker/Dockerfile.vineyardruntime‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ RUN make vineyardruntime-controller-build && \
1010

1111
# alpine:3.20.6
1212
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
13-
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
13+
RUN apk add --update bash curl wget iproute2 libc6-compat tzdata vim && \
1414
rm -rf /var/cache/apk/* && \
1515
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1616
echo "Asia/Shanghai" > /etc/timezone
1717

1818
ARG TARGETARCH
1919
ARG HELM_VERSION
20-
RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
21-
tar -xvf ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
20+
RUN wget -O helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://github.com/fluid-cloudnative/helm/releases/download/${HELM_VERSION}/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
21+
tar -xvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
2222
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
2323
chmod u+x /usr/local/bin/ddc-helm && \
2424
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz

0 commit comments

Comments
 (0)