Skip to content

Commit 9ed3d2f

Browse files
author
玖宇
committed
import self-maintainerd ddc-helm in dockerfile
Signed-off-by: 玖宇 <guotongyu.gty@alibaba-inc.com>
1 parent 3ad670b commit 9ed3d2f

7 files changed

Lines changed: 57 additions & 24 deletions

‎docker/Dockerfile.alluxioruntime‎

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

11+
WORKDIR /go/src/github.com/fluid-cloudnative/
12+
RUN git clone https://github.com/fluid-cloudnative/helm.git
13+
WORKDIR /go/src/github.com/fluid-cloudnative/helm
14+
RUN git checkout release-3.17 && \
15+
make build && \
16+
cp bin/helm /go/bin/ddc-helm
17+
1118
# alpine:3.20.6
1219
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
1320
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
1421
rm -rf /var/cache/apk/* && \
1522
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1623
echo "Asia/Shanghai" > /etc/timezone
1724

18-
ARG TARGETARCH
19-
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 && \
22-
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
23-
chmod u+x /usr/local/bin/ddc-helm && \
24-
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz
25-
2625
COPY charts/ /charts
2726

2827
COPY --from=builder /go/bin/alluxioruntime-controller /usr/local/bin/alluxioruntime-controller
28+
COPY --from=builder /go/bin/ddc-helm /usr/local/bin/ddc-helm
29+
2930
RUN chmod -R u+x /usr/local/bin/
3031

3132
CMD ["alluxioruntime-controller", "start"]

‎docker/Dockerfile.efcruntime‎

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

11+
WORKDIR /go/src/github.com/fluid-cloudnative/
12+
RUN git clone https://github.com/fluid-cloudnative/helm.git
13+
WORKDIR /go/src/github.com/fluid-cloudnative/helm
14+
RUN git checkout release-3.17 && \
15+
make build && \
16+
cp bin/helm /go/bin/ddc-helm
17+
1118
# Debug
1219
#RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
1320

@@ -18,17 +25,10 @@ RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
1825
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1926
echo "Asia/Shanghai" > /etc/timezone
2027

21-
ARG TARGETARCH
22-
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-
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
26-
chmod u+x /usr/local/bin/ddc-helm && \
27-
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz
28-
2928
COPY charts/ /charts
3029

3130
COPY --from=builder /go/bin/efcruntime-controller /usr/local/bin/efcruntime-controller
31+
COPY --from=builder /go/bin/ddc-helm /usr/local/bin/ddc-helm
3232
#COPY --from=builder /go/bin/dlv /usr/local/bin/dlv
3333
RUN chmod -R u+x /usr/local/bin/
3434

‎docker/Dockerfile.goosefsruntime‎

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

11+
WORKDIR /go/src/github.com/fluid-cloudnative/
12+
RUN git clone https://github.com/fluid-cloudnative/helm.git
13+
WORKDIR /go/src/github.com/fluid-cloudnative/helm
14+
RUN git checkout release-3.17 && \
15+
make build && \
16+
cp bin/helm /go/bin/ddc-helm
17+
1118
# Debug
1219
RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
1320

@@ -18,17 +25,10 @@ RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
1825
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
1926
echo "Asia/Shanghai" > /etc/timezone
2027

21-
ARG TARGETARCH
22-
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-
mv linux-${TARGETARCH}/helm /usr/local/bin/ddc-helm && \
26-
chmod u+x /usr/local/bin/ddc-helm && \
27-
rm -f ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz
28-
2928
COPY charts/ /charts
3029

3130
COPY --from=builder /go/bin/goosefsruntime-controller /usr/local/bin/goosefsruntime-controller
31+
COPY --from=builder /go/bin/ddc-helm /usr/local/bin/ddc-helm
3232
COPY --from=builder /go/bin/dlv /usr/local/bin/dlv
3333
RUN chmod -R u+x /usr/local/bin/
3434

‎docker/Dockerfile.jindoruntime‎

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

11+
WORKDIR /go/src/github.com/fluid-cloudnative/
12+
RUN git clone https://github.com/fluid-cloudnative/helm.git
13+
WORKDIR /go/src/github.com/fluid-cloudnative/helm
14+
RUN git checkout release-3.17 && \
15+
make build && \
16+
cp bin/helm /go/bin/ddc-helm
17+
1118
# alpine:3.20.6
1219
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
1320
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
@@ -29,6 +36,7 @@ COPY charts/jindofsx /charts/jindofsx
2936
COPY charts/jindocache /charts/jindocache
3037

3138
COPY --from=builder /go/bin/jindoruntime-controller /usr/local/bin/jindoruntime-controller
39+
COPY --from=builder /go/bin/ddc-helm /usr/local/bin/ddc-helm
3240
#COPY --from=builder /go/bin/dlv /usr/local/bin/dlv
3341
RUN chmod -R u+x /usr/local/bin/
3442

‎docker/Dockerfile.juicefsruntime‎

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

11+
WORKDIR /go/src/github.com/fluid-cloudnative/
12+
RUN git clone https://github.com/fluid-cloudnative/helm.git
13+
WORKDIR /go/src/github.com/fluid-cloudnative/helm
14+
RUN git checkout release-3.17 && \
15+
make build && \
16+
cp bin/helm /go/bin/ddc-helm
17+
1118
# Debug
1219
#RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
1320

@@ -29,6 +36,7 @@ RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HEL
2936
COPY charts/ /charts
3037

3138
COPY --from=builder /go/bin/juicefsruntime-controller /usr/local/bin/juicefsruntime-controller
39+
COPY --from=builder /go/bin/ddc-helm /usr/local/bin/ddc-helm
3240
#COPY --from=builder /go/bin/dlv /usr/local/bin/dlv
3341
RUN chmod -R u+x /usr/local/bin/
3442

‎docker/Dockerfile.thinruntime‎

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

11+
WORKDIR /go/src/github.com/fluid-cloudnative/
12+
RUN git clone https://github.com/fluid-cloudnative/helm.git
13+
WORKDIR /go/src/github.com/fluid-cloudnative/helm
14+
RUN git checkout release-3.17 && \
15+
make build && \
16+
cp bin/helm /go/bin/ddc-helm
17+
1118
# Debug
1219
#RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
1320

@@ -29,6 +36,7 @@ RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HEL
2936
COPY charts/ /charts
3037

3138
COPY --from=builder /go/bin/thinruntime-controller /usr/local/bin/thinruntime-controller
39+
COPY --from=builder /go/bin/ddc-helm /usr/local/bin/ddc-helm
3240
#COPY --from=builder /go/bin/dlv /usr/local/bin/dlv
3341
RUN chmod -R u+x /usr/local/bin/
3442

‎docker/Dockerfile.vineyardruntime‎

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

11+
WORKDIR /go/src/github.com/fluid-cloudnative/
12+
RUN git clone https://github.com/fluid-cloudnative/helm.git
13+
WORKDIR /go/src/github.com/fluid-cloudnative/helm
14+
RUN git checkout release-3.17 && \
15+
make build && \
16+
cp bin/helm /go/bin/ddc-helm
17+
1118
# alpine:3.20.6
1219
FROM alpine:3.20.6@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f
1320
RUN apk add --update bash curl iproute2 libc6-compat tzdata vim && \
@@ -26,6 +33,7 @@ RUN curl -o ${HELM_VERSION}-linux-${TARGETARCH}.tar.gz https://get.helm.sh/${HEL
2633
COPY charts/ /charts
2734

2835
COPY --from=builder /go/bin/vineyardruntime-controller /usr/local/bin/vineyardruntime-controller
36+
COPY --from=builder /go/bin/ddc-helm /usr/local/bin/ddc-helm
2937
#COPY --from=builder /go/bin/dlv /usr/local/bin/dlv
3038
RUN chmod -R u+x /usr/local/bin/
3139

0 commit comments

Comments
 (0)