PullRequest: 79 fix(aci): release aci may failed

ungreat · MarkPotato777 · commit d2d0014fe87f · 2025-07-10T17:17:54.000+08:00
Merge branch yiang_procee_build_docker_file of git@code.alipay.com:oceanbase-cloud-platform/odc-mirror.git into dev/4.4.x https://code.alipay.com/oceanbase-cloud-platform/odc-mirror/pull_requests/79 Reviewed-by: 乐别 <yinuo.pyn@oceanbase.com> * fix release aci
diff --git a/build_release.aci.yml b/build_release.aci.yml
@@ -92,7 +92,7 @@ RPM&JAR打包:
   passEnv: true            # 将outputs 的数据传递到其他任务
   pluginConfig:
     computeType: large
-    image: reg.docker.alibaba-inc.com/oceanbase/odc-build:latest
+    image: reg.docker.alibaba-inc.com/oceanbase/odc-build:4.0.0
     script:
       # Build rpm package
       - TZ='Asia/Shanghai'; export TZ; echo "[ODC Pipeline] Begin rpm build at `date`"
@@ -129,7 +129,7 @@ AARCH-RPM&JAR打包:
   passEnv: true            # 将outputs 的数据传递到其他任务
   pluginConfig:
     computeType: large
-    image: reg.docker.alibaba-inc.com/oceanbase/odc-build-arm:latest
+    image: reg.docker.alibaba-inc.com/oceanbase/odc-build-arm:4.0.0
     architecture: aarch64
     environments:
       GIT_SUBMODULE_STRATEGY: recursive
@@ -160,7 +160,7 @@ AARCH-RPM&JAR打包:
   stage: 构建Docker
   plugin: ANT-BUILD
   pluginConfig:
-    image: reg.docker.alibaba-inc.com/oceanbase/odc-build:latest
+    image: reg.docker.alibaba-inc.com/oceanbase/odc-build:4.0.0
     script:
       - TZ='Asia/Shanghai'; export TZ; echo "[ODC Pipeline] Begin docker build at `date`"
       - filename=$(echo "${odc_server_x86_rpm}" | grep --only-matching 'odc-server.*rpm' ) || true
diff --git a/distribution/docker/odc-build/Dockerfile b/distribution/docker/odc-build/Dockerfile
@@ -18,9 +18,9 @@ ARG USERNAME=admin
 ARG WORKDIR=/home/admin
 ARG USER_HOME_DIR="/root"
 ARG NODE_VERSION="14.19.1"
-ARG JDK_VERSION="java-1.8.0-openjdk-headless-1.8.0.312.b07 java-1.8.0-openjdk-1.8.0.312.b07 java-1.8.0-openjdk-devel-1.8.0.312.b07"
-ARG MAVEN_VERSION=3.5.4
-ARG MAVEN_BASE_URL=https://mirrors.aliyun.com/apache/maven/maven-3/${MAVEN_VERSION}/binaries
+ARG JDK_VERSION="java-17-openjdk-headless java-17-openjdk java-17-openjdk-devel"
+ARG MAVEN_VERSION=3.6.3
+ARG MAVEN_BASE_URL=https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz
 ARG BUILD_UTIL_HOME=/home/admin/util
 
 RUN useradd -ms /bin/bash ${USERNAME}
@@ -40,7 +40,7 @@ RUN mkdir -p /etc/yum.repos.d/bak/ \
     && yum install -y --exclude=ali-jdk ${JDK_VERSION}
 
 RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
-  && curl -fsSL -o /tmp/apache-maven.tar.gz ${MAVEN_BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+  && curl -fsSL -o /tmp/apache-maven.tar.gz ${MAVEN_BASE_URL} \
   && tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \
   && rm -f /tmp/apache-maven.tar.gz \
   && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
@@ -50,7 +50,7 @@ RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
 # create node develop env & ossutil
 RUN sh ${WORKDIR}/create_node_env.sh && ${WORKDIR}/install_ossutil.sh ${BUILD_UTIL_HOME}
 
-ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.312.b07-2.el8_5.x86_64
+ENV JAVA_HOME=/usr/lib/jvm/java-17
 ENV MAVEN_HOME=/usr/share/maven
 ENV MAVEN_CONFIG=$USER_HOME_DIR/.m2
 ENV NVS_HOME=/usr/local/nvs
diff --git a/distribution/docker/odc-build/aarch/Dockerfile b/distribution/docker/odc-build/aarch/Dockerfile
@@ -19,8 +19,9 @@ ARG WORKDIR=/home/admin
 ARG USER_HOME_DIR="/root"
 ARG NODE_VERSION="14.19.1"
 ARG JDK_VERSION="java-17-openjdk-headless java-17-openjdk java-17-openjdk-devel"
-ARG MAVEN_VERSION=3.5.4
-ARG MAVEN_BASE_URL=https://mirrors.aliyun.com/apache/maven/maven-3/${MAVEN_VERSION}/binaries
+ARG MAVEN_VERSION=3.6.3
+ARG MAVEN_BASE_URL=https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz
+
 ARG BUILD_UTIL_HOME=/home/admin/util
 
 RUN useradd -ms /bin/bash ${USERNAME}
@@ -40,7 +41,7 @@ RUN mkdir -p /etc/yum.repos.d/bak/ \
     && yum install -y --exclude=ali-jdk ${JDK_VERSION}
 
 RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
-  && curl -fsSL -o /tmp/apache-maven.tar.gz ${MAVEN_BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+  && curl -fsSL -o /tmp/apache-maven.tar.gz ${MAVEN_BASE_URL} \
   && tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \
   && rm -f /tmp/apache-maven.tar.gz \
   && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
diff --git a/distribution/docker/odc/Dockerfile b/distribution/docker/odc/Dockerfile
@@ -17,24 +17,23 @@ LABEL description="OceanBase Developer Center (ODC)"
 # parameters
 ARG ODC_INSTALL_DIR=/opt/odc
 ARG JDK_VERSION="java-17-openjdk-headless java-17-openjdk java-17-openjdk-devel"
-ARG PYTHON_VERSION=python2
-ARG PYTHON_PIP_VERSION=python2-pip-9.0.3
-ARG PYTHON_PIP_UPGRADE_VERSION=20.0.2
+ARG PYTHON_VERSION=python38
+ARG PYTHON_PIP_UPGRADE_VERSION=23.3.1
+
 
 ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.utf-8
 
+
 # install jdk/supervisor, tcpdump, supervisor (install by python pip)
 RUN yum clean all && yum makecache \
-    && yum install -y --exclude=ali-jdk ${JDK_VERSION} ${PYTHON_VERSION} ${PYTHON_PIP_VERSION} tcpdump passwd langpacks-en glibc-all-langpacks glibc-locale-source glibc-langpack-en \
+    && yum update -y --exclude=ali-jdk\
+    && yum install -y --exclude=ali-jdk ${JDK_VERSION} ${PYTHON_VERSION} tcpdump passwd langpacks-en glibc-all-langpacks glibc-locale-source glibc-langpack-en \
     && ln -sf /usr/share/zoneinfo/Asia/Shanghai  /etc/localtime \
     && localedef -i en_US -f UTF-8 en_US.UTF-8 \
-    && yum update -y --exclude=ali-jdk \
-    && ln -s /usr/bin/python2 /usr/bin/python \
-    && ln -s /usr/bin/pip2 /usr/bin/pip \
     && ln -s /usr/lib64/libtinfo.so.6.1 /usr/lib64/libtinfo.so.5 \
-    && pip install --upgrade pip==${PYTHON_PIP_UPGRADE_VERSION} -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
-    && pip install supervisor -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com --ignore-installed \
+    && pip3 install --upgrade pip==${PYTHON_PIP_UPGRADE_VERSION} -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
+    && pip3 install supervisor -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com --ignore-installed \
     && yum clean all \
     && rm -rf /var/cache/yum
 
@@ -72,4 +71,4 @@ RUN rpm -ivh ${ODC_INSTALL_DIR}/tmp/*.rpm \
 
 EXPOSE 8989
 
-ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
+ENTRYPOINT ["/usr/local/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
