Skip to content

Commit 1ebbeba

Browse files
authored
Merge pull request #1559 from mowangdk/feat/bump_efc_alinas_version
bump efc & alinas version
2 parents 5a791a5 + ccdcc56 commit 1ebbeba

File tree

2 files changed

+27
-10
lines changed

2 files changed

+27
-10
lines changed

build/csi-agent/Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ ARG TARGETPLATFORM
1818
# The versions specified here are for RPM packages, which may not necessarily align with the image version
1919
ARG OSSFS_VERSION=v1.91.8.ack.3
2020
ARG OSSFS2_VERSION=v2.0.4.ack.1
21-
ARG ALINAS_UTILS_VERSION=1.8-0.20250410201011.30aa55.al7
22-
ARG EFC_VERSION=1.8-20250226151552.7151bf.release
21+
ARG ALINAS_UTILS_VERSION=1.9-0.20250805171424.2871b7.al7
22+
ARG EFC_VERSION=1.9-20250822095129.f34347.release
23+
# v2.1 is exclusive to a specific storage cluster version and the first to support ARM arch.
24+
# It's temporarily unavailable for all ACK clusters,
25+
# catering only to ARM for compatibility. An update to all CPFS storage cluster versions is required.
26+
ARG EFC_ARM_VERSION=2.1-20251105164215.8422bf.release
27+
ARG ALINAS_UTILS_ARM_VERSION=2.1-0.20251104202327.e70d33.generic
2328
RUN set -ex; \
2429
case "${TARGETPLATFORM}" in \
2530
linux/amd64) ARCH="x86_64" ;; \
@@ -32,13 +37,15 @@ RUN set -ex; \
3237
if [ "${ARCH}" = "x86_64" ]; then \
3338
yum install -y https://aliyun-alinas-eac.oss-cn-beijing.aliyuncs.com/aliyun-alinas-utils-${ALINAS_UTILS_VERSION}.noarch.rpm; \
3439
yum install -y https://aliyun-alinas-eac.oss-cn-beijing.aliyuncs.com/alinas-efc-${EFC_VERSION}.${ARCH}.rpm; \
35-
cp -r /etc/aliyun /etc/aliyun-defaults; \
40+
elif [ "${ARCH}" = "aarch_64" ]; then \
41+
yum install -y https://aliyun-alinas-eac.oss-cn-beijing.aliyuncs.com/aliyun-alinas-utils-${ALINAS_UTILS_ARM_VERSION}.aarch64.rpm; \
42+
yum install -y https://aliyun-alinas-eac.oss-cn-beijing.aliyuncs.com/alinas-efc-${EFC_ARM_VERSION}.aarch64.rpm; \
3643
fi; \
44+
cp -r /etc/aliyun /etc/aliyun-defaults; \
3745
yum clean all; \
3846
update-alternatives --set python3 /usr/bin/python3.8
3947

4048

4149
COPY --link --from=builder /out/csi-mount-proxy-server /usr/local/bin/
4250
COPY --link --from=builder /out/csi-agent /usr/local/bin/
43-
ENTRYPOINT [ "tini", "--", "csi-mount-proxy-server", "--driver=alinas,ossfs,ossfs2" ]
44-
51+
ENTRYPOINT [ "tini", "--", "csi-mount-proxy-server", "--driver=alinas,ossfs,ossfs2" ]

build/mount-proxy/Dockerfile

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,27 @@ ENTRYPOINT ["csi-mount-proxy-server", "--driver=ossfs2"]
9696
FROM registry-cn-hangzhou.ack.aliyuncs.com/dev/alinux:3-update as alinas
9797

9898
ARG TARGETPLATFORM
99-
ARG ALINAS_UTILS_VERSION=1.8-0.20250410201011.30aa55.al7
100-
ARG EFC_VERSION=1.8-20250226151552.7151bf.release
99+
ARG ALINAS_UTILS_VERSION=1.9-0.20250805171424.2871b7.al7
100+
ARG EFC_VERSION=1.9-20250822095129.f34347.release
101+
# v2.1 is exclusive to a specific storage cluster version and the first to support ARM arch.
102+
# It's temporarily unavailable for all ACK clusters,
103+
# catering only to ARM for compatibility. An update to all CPFS storage cluster versions is required.
104+
ARG EFC_ARM_VERSION=2.1-20251105164215.8422bf.release
105+
ARG ALINAS_UTILS_ARM_VERSION=2.1-0.20251104202327.e70d33.generic
101106
RUN set -ex; \
102107
case "${TARGETPLATFORM}" in \
103108
linux/amd64) ARCH="x86_64" ;; \
104-
# linux/arm64) ARCH="aarch_64" ;; \
109+
linux/arm64) ARCH="aarch_64" ;; \
105110
*) echo "unsupported platform"; exit 1 ;; \
106111
esac; \
107112
yum install -y util-linux procps python38 tini; \
108-
yum install -y https://aliyun-alinas-eac.oss-cn-beijing.aliyuncs.com/aliyun-alinas-utils-${ALINAS_UTILS_VERSION}.noarch.rpm; \
109-
yum install -y https://aliyun-alinas-eac.oss-cn-beijing.aliyuncs.com/alinas-efc-${EFC_VERSION}.${ARCH}.rpm; \
113+
if [ "${ARCH}" = "x86_64" ]; then \
114+
yum install -y https://aliyun-alinas-eac.oss-cn-beijing.aliyuncs.com/aliyun-alinas-utils-${ALINAS_UTILS_VERSION}.noarch.rpm; \
115+
yum install -y https://aliyun-alinas-eac.oss-cn-beijing.aliyuncs.com/alinas-efc-${EFC_VERSION}.${ARCH}.rpm; \
116+
elif [ "${ARCH}" = "aarch_64" ]; then \
117+
yum install -y https://aliyun-alinas-eac.oss-cn-beijing.aliyuncs.com/aliyun-alinas-utils-${ALINAS_UTILS_ARM_VERSION}.aarch64.rpm; \
118+
yum install -y https://aliyun-alinas-eac.oss-cn-beijing.aliyuncs.com/alinas-efc-${EFC_ARM_VERSION}.aarch64.rpm; \
119+
fi; \
110120
yum clean all; \
111121
update-alternatives --set python3 /usr/bin/python3.8
112122
# alinas-utils generates some dynamic configuration files (such as TLS keys, etc.) under /etc/aliyun/{alinas,cpfs}.

0 commit comments

Comments
 (0)