From bc1295741d2444887fd4bbfc5645a5d381ff840d Mon Sep 17 00:00:00 2001 From: Yichen Yan Date: Wed, 20 Sep 2023 14:49:55 +0800 Subject: [PATCH 01/11] Add spark 3.3.3 image. --- APPLICATION/spark/buildspec.yml | 49 +++++++++++++++ APPLICATION/spark/general/Dockerfile | 85 +++++++++++++++++++++++++++ APPLICATION/spark/general/tini-amd64 | Bin 0 -> 24064 bytes APPLICATION/spark/general/tini-arm64 | Bin 0 -> 23904 bytes APPLICATION/spark/version.yml | 8 +++ 5 files changed, 142 insertions(+) create mode 100644 APPLICATION/spark/buildspec.yml create mode 100644 APPLICATION/spark/general/Dockerfile create mode 100755 APPLICATION/spark/general/tini-amd64 create mode 100755 APPLICATION/spark/general/tini-arm64 create mode 100644 APPLICATION/spark/version.yml diff --git a/APPLICATION/spark/buildspec.yml b/APPLICATION/spark/buildspec.yml new file mode 100644 index 0000000..7ee7c6b --- /dev/null +++ b/APPLICATION/spark/buildspec.yml @@ -0,0 +1,49 @@ +name: &NAME +version: &VERSION +image_type: &IMAGE_TYPE +baseos_version: &BASEOS_VERSION + +# 定义镜像仓库信息 +repository_info: + dockerhub: &DOCKERHUB_PROD + acr: &ACR_PROD + +t-one: + workspace: &WORKSPACE container_ci_test + project: &PROJECT default_container_ci_test + test_suite: &TEST_SUITE image-ci-test + test_conf: &TEST_CONF group=big_data_container + test_case: &TEST_CASE big_data_container_default + cloud_server_tag: &CLOUD_SERVER_TAG [anolis-container-ci-x86, anolis-container-ci-arm] + +images: + BuildSparkECSApplicationDockerImage: + build: true + docker_file: + path: LANGUAGE/spark/general/Dockerfile + variable: + - &SPARK33_JAVA8_A86 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.6), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "8"), (OS_SUFFIX, "8.6")] + - &SPARK33_JAVA11_A86 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.6), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "11"), (OS_SUFFIX, "8.6")] + - &SPARK33_JAVA8_A88 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.8), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "8"), (OS_SUFFIX, "8.8")] + - &SPARK33_JAVA11_A88 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.8), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "11"), (OS_SUFFIX, "8.8")] + - &SPARK33_JAVA8_A3 [(BASE_OS, alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "8"), (OS_SUFFIX, "3")] + - &SPARK33_JAVA11_A3 [(BASE_OS, alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "11"), (OS_SUFFIX, "3")] + - &SPARK33_JAVA8_A23 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:23), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "8"), (OS_SUFFIX, "23")] + - &SPARK33_JAVA11_A23 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:23), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "11"), (OS_SUFFIX, "23")] + scene: + args: [ + *SPARK33_JAVA8_A86, *SPARK33_JAVA11_A86, + *SPARK33_JAVA8_A88, *SPARK33_JAVA11_A88, + *SPARK33_JAVA8_A3, *SPARK33_JAVA11_A3, + *SPARK33_JAVA8_A23, *SPARK33_JAVA11_A23] + tags: + - ["3.3.3-java8-8.6", "3.3-java8-8.6", "3-java8-8.6"] + - ["3.3.3-java11-8.6", "3.3-java11-8.6", "3-java11-8.6", "3.3.3-8.6", "3.3-8.6", "3-8.6"] + - ["3.3.3-java8-8.8", "3.3-java8-8.8", "3-java8-8.8"] + - ["3.3.3-java11-8.8", "3.3-java11-8.8", "3-java11-8.8", "3.3.3-8.8", "3.3-8.8", "3-8.8"] + - ["3.3.3-java8-3", "3.3-java8-3", "3-java8-3"] + - ["3.3.3-java11-3", "3.3-java11-3", "3-java11-3", "3.3.3-3", "3.3-3", "3-3"] + - ["3.3.3-java8-23", "3.3-java8-23", "3-java8-23", "3.3.3-java8", "3.3-java8", "3-java8"] + - ["3.3.3-java11-23", "3.3-java11-23", "3-java11-23", "3.3.3-23", "3.3-23", "3-23", "3.3.3", "3.3", "3", "latest"] + registry: [*ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD] + test_config: [*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG, ''] diff --git a/APPLICATION/spark/general/Dockerfile b/APPLICATION/spark/general/Dockerfile new file mode 100644 index 0000000..8721e81 --- /dev/null +++ b/APPLICATION/spark/general/Dockerfile @@ -0,0 +1,85 @@ +ARG SPARK_VERSION +ARG BASE_OS + +FROM registry.openanolis.cn/openanolis/anolisos:23 as downloader +ARG SPARK_VERSION + +ARG SPARK_FILE=spark-${SPARK_VERSION}-bin-hadoop3 + +RUN yum install -y tar gzip + +RUN curl -O -m 600 https://mirrors.ustc.edu.cn/apache/spark/spark-${SPARK_VERSION}/${SPARK_FILE}.tgz +RUN gzip -d ${SPARK_FILE}.tgz +RUN tar xf ${SPARK_FILE}.tar +RUN mv ${SPARK_FILE} spark + +COPY tini-amd64 / +COPY tini-arm64 / + +RUN set -eux; \ + if [ "$(uname -m)" == "aarch64" ]; then \ + mv tini-arm64 tini; \ + else \ + mv tini-amd64 tini; \ + fi + +FROM ${BASE_OS} + +ARG SPARK_VERSION +ARG OS_SUFFIX +ARG JAVA_VERSION +ARG spark_uid=185 + +LABEL org.opencontainers.image.title="Spark" \ + org.opencontainers.image.version="${SPARK_VERSION}-${OS_SUFFIX}" + +ENV SPARK_VERSION ${SPARK_VERSION} + +RUN set -eux; \ + yum install -y net-tools iputils hostname; \ + case "${JAVA_VERSION}" in \ + "8" ) \ + yum install -y java-1.8.0-alibaba-dragonwell \ + ;; \ + "11" ) \ + yum install -y java-11-alibaba-dragonwell \ + ;; \ + * ) \ + echo unsupported java version: ${JAVA_VERSION}; exit 1 \ + ;; \ + esac; \ + mkdir -p /opt/spark; \ + mkdir -p /opt/spark/examples; \ + mkdir -p /opt/spark/work-dir; \ + touch /opt/spark/RELEASE; \ + echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su; \ + chgrp root /etc/passwd && chmod ug+rw /etc/passwd; \ + yum clean all + +COPY --from=downloader /spark/jars /opt/spark/jars +COPY --from=downloader /spark/bin /opt/spark/bin +COPY --from=downloader /spark/sbin /opt/spark/sbin +COPY --from=downloader /spark/kubernetes/dockerfiles/spark/entrypoint.sh /opt/ +COPY --from=downloader /spark/kubernetes/dockerfiles/spark/decom.sh /opt/ +COPY --from=downloader /spark/examples /opt/spark/examples +COPY --from=downloader /spark/kubernetes/tests /opt/spark/tests +COPY --from=downloader /spark/data /opt/spark/data + +ENV SPARK_HOME /opt/spark +ENV PATH ${SPARK_HOME}/bin:${PATH} + +WORKDIR /opt/spark/work-dir + +RUN set -eux; \ + groupadd --system --gid=${spark_uid} spark; \ + useradd --system --uid=${spark_uid} --gid=spark spark; \ + chown -R spark:spark /opt/spark; \ + chmod g+w /opt/spark/work-dir; \ + chmod a+x /opt/decom.sh + +COPY --from=downloader /tini /usr/bin/tini + +ENTRYPOINT [ "/opt/entrypoint.sh" ] + +# Specify the User that the actual main process will run as +USER ${spark_uid} diff --git a/APPLICATION/spark/general/tini-amd64 b/APPLICATION/spark/general/tini-amd64 new file mode 100755 index 0000000000000000000000000000000000000000..86cb766c6b8af2564ac9201df913fe079acae3d1 GIT binary patch literal 24064 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 literal 0 HcmV?d00001 diff --git a/APPLICATION/spark/version.yml b/APPLICATION/spark/version.yml new file mode 100644 index 0000000..974d70c --- /dev/null +++ b/APPLICATION/spark/version.yml @@ -0,0 +1,8 @@ +# 版本关系依赖表,默认继承 version-base.yml 配置,可重写覆盖 +BaseDependency: ../version-base.yml +Dependency: + name: spark + image_type: application + versions: + general: + baseos_version: [[ignored]] -- Gitee From ebede060ce232d0f22502446ff747b27f66f4c27 Mon Sep 17 00:00:00 2001 From: Yichen Yan Date: Wed, 20 Sep 2023 14:55:26 +0800 Subject: [PATCH 02/11] fix --- APPLICATION/spark/buildspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APPLICATION/spark/buildspec.yml b/APPLICATION/spark/buildspec.yml index 7ee7c6b..f3af165 100644 --- a/APPLICATION/spark/buildspec.yml +++ b/APPLICATION/spark/buildspec.yml @@ -20,7 +20,7 @@ images: BuildSparkECSApplicationDockerImage: build: true docker_file: - path: LANGUAGE/spark/general/Dockerfile + path: APPLICATION/spark/general/Dockerfile variable: - &SPARK33_JAVA8_A86 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.6), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "8"), (OS_SUFFIX, "8.6")] - &SPARK33_JAVA11_A86 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.6), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "11"), (OS_SUFFIX, "8.6")] -- Gitee From 8e92a4228423f8e37a342726781929bdc6c19971 Mon Sep 17 00:00:00 2001 From: Yichen Yan Date: Wed, 20 Sep 2023 15:06:42 +0800 Subject: [PATCH 03/11] update test config --- APPLICATION/spark/buildspec.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/APPLICATION/spark/buildspec.yml b/APPLICATION/spark/buildspec.yml index f3af165..bbd864e 100644 --- a/APPLICATION/spark/buildspec.yml +++ b/APPLICATION/spark/buildspec.yml @@ -46,4 +46,6 @@ images: - ["3.3.3-java8-23", "3.3-java8-23", "3-java8-23", "3.3.3-java8", "3.3-java8", "3-java8"] - ["3.3.3-java11-23", "3.3-java11-23", "3-java11-23", "3.3.3-23", "3.3-23", "3-23", "3.3.3", "3.3", "3", "latest"] registry: [*ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD] - test_config: [*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG, ''] + test_config: + - (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], '') + - (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '') -- Gitee From 391c49ff5c83ce3e677fb0102699f6cafd1e8f37 Mon Sep 17 00:00:00 2001 From: Yichen Yan Date: Wed, 20 Sep 2023 16:04:26 +0800 Subject: [PATCH 04/11] update test config --- APPLICATION/spark/buildspec.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/APPLICATION/spark/buildspec.yml b/APPLICATION/spark/buildspec.yml index bbd864e..7cb34de 100644 --- a/APPLICATION/spark/buildspec.yml +++ b/APPLICATION/spark/buildspec.yml @@ -47,5 +47,11 @@ images: - ["3.3.3-java11-23", "3.3-java11-23", "3-java11-23", "3.3.3-23", "3.3-23", "3-23", "3.3.3", "3.3", "3", "latest"] registry: [*ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD] test_config: - - (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], '') - - (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '') + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] -- Gitee From 2828003c3a8d0d3e8bde1fd083314621c4ea3ba4 Mon Sep 17 00:00:00 2001 From: Yichen Yan Date: Wed, 20 Sep 2023 17:00:43 +0800 Subject: [PATCH 05/11] remove anolis 8 images --- APPLICATION/spark/buildspec.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/APPLICATION/spark/buildspec.yml b/APPLICATION/spark/buildspec.yml index 7cb34de..40226b6 100644 --- a/APPLICATION/spark/buildspec.yml +++ b/APPLICATION/spark/buildspec.yml @@ -22,35 +22,35 @@ images: docker_file: path: APPLICATION/spark/general/Dockerfile variable: - - &SPARK33_JAVA8_A86 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.6), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "8"), (OS_SUFFIX, "8.6")] - - &SPARK33_JAVA11_A86 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.6), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "11"), (OS_SUFFIX, "8.6")] - - &SPARK33_JAVA8_A88 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.8), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "8"), (OS_SUFFIX, "8.8")] - - &SPARK33_JAVA11_A88 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.8), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "11"), (OS_SUFFIX, "8.8")] + # - &SPARK33_JAVA8_A86 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.6), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "8"), (OS_SUFFIX, "8.6")] + # - &SPARK33_JAVA11_A86 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.6), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "11"), (OS_SUFFIX, "8.6")] + # - &SPARK33_JAVA8_A88 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.8), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "8"), (OS_SUFFIX, "8.8")] + # - &SPARK33_JAVA11_A88 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.8), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "11"), (OS_SUFFIX, "8.8")] - &SPARK33_JAVA8_A3 [(BASE_OS, alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "8"), (OS_SUFFIX, "3")] - &SPARK33_JAVA11_A3 [(BASE_OS, alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "11"), (OS_SUFFIX, "3")] - &SPARK33_JAVA8_A23 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:23), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "8"), (OS_SUFFIX, "23")] - &SPARK33_JAVA11_A23 [(BASE_OS, registry.openanolis.cn/openanolis/anolisos:23), (SPARK_VERSION, "3.3.3"), (JAVA_VERSION, "11"), (OS_SUFFIX, "23")] scene: args: [ - *SPARK33_JAVA8_A86, *SPARK33_JAVA11_A86, - *SPARK33_JAVA8_A88, *SPARK33_JAVA11_A88, + # *SPARK33_JAVA8_A86, *SPARK33_JAVA11_A86, + # *SPARK33_JAVA8_A88, *SPARK33_JAVA11_A88, *SPARK33_JAVA8_A3, *SPARK33_JAVA11_A3, *SPARK33_JAVA8_A23, *SPARK33_JAVA11_A23] tags: - - ["3.3.3-java8-8.6", "3.3-java8-8.6", "3-java8-8.6"] - - ["3.3.3-java11-8.6", "3.3-java11-8.6", "3-java11-8.6", "3.3.3-8.6", "3.3-8.6", "3-8.6"] - - ["3.3.3-java8-8.8", "3.3-java8-8.8", "3-java8-8.8"] - - ["3.3.3-java11-8.8", "3.3-java11-8.8", "3-java11-8.8", "3.3.3-8.8", "3.3-8.8", "3-8.8"] - - ["3.3.3-java8-3", "3.3-java8-3", "3-java8-3"] + # - ["3.3.3-java8-8.6", "3.3-java8-8.6", "3-java8-8.6"] + # - ["3.3.3-java11-8.6", "3.3-java11-8.6", "3-java11-8.6", "3.3.3-8.6", "3.3-8.6", "3-8.6"] + # - ["3.3.3-java8-8.8", "3.3-java8-8.8", "3-java8-8.8"] + # - ["3.3.3-java11-8.8", "3.3-java11-8.8", "3-java11-8.8", "3.3.3-8.8", "3.3-8.8", "3-8.8"] + # - ["3.3.3-java8-3", "3.3-java8-3", "3-java8-3"] - ["3.3.3-java11-3", "3.3-java11-3", "3-java11-3", "3.3.3-3", "3.3-3", "3-3"] - ["3.3.3-java8-23", "3.3-java8-23", "3-java8-23", "3.3.3-java8", "3.3-java8", "3-java8"] - ["3.3.3-java11-23", "3.3-java11-23", "3-java11-23", "3.3.3-23", "3.3-23", "3-23", "3.3.3", "3.3", "3", "latest"] registry: [*ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD] test_config: - - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] - - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] - - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] - - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] + # - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] + # - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] + # - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] + # - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] -- Gitee From e6e96cf9b7dee434909ef1e6477f7f40de49ebc5 Mon Sep 17 00:00:00 2001 From: Yichen Yan Date: Thu, 21 Sep 2023 16:32:30 +0800 Subject: [PATCH 06/11] Fix tini permission. --- APPLICATION/spark/general/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/APPLICATION/spark/general/Dockerfile b/APPLICATION/spark/general/Dockerfile index 8721e81..627de04 100644 --- a/APPLICATION/spark/general/Dockerfile +++ b/APPLICATION/spark/general/Dockerfile @@ -21,7 +21,8 @@ RUN set -eux; \ mv tini-arm64 tini; \ else \ mv tini-amd64 tini; \ - fi + fi; \ + chmod +x tini FROM ${BASE_OS} -- Gitee From 392af26483b24d12241101b2f0bb051c61e7d226 Mon Sep 17 00:00:00 2001 From: Yichen Yan Date: Thu, 21 Sep 2023 16:36:54 +0800 Subject: [PATCH 07/11] Fix config. --- APPLICATION/spark/buildspec.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/APPLICATION/spark/buildspec.yml b/APPLICATION/spark/buildspec.yml index 40226b6..04852d8 100644 --- a/APPLICATION/spark/buildspec.yml +++ b/APPLICATION/spark/buildspec.yml @@ -41,11 +41,11 @@ images: # - ["3.3.3-java11-8.6", "3.3-java11-8.6", "3-java11-8.6", "3.3.3-8.6", "3.3-8.6", "3-8.6"] # - ["3.3.3-java8-8.8", "3.3-java8-8.8", "3-java8-8.8"] # - ["3.3.3-java11-8.8", "3.3-java11-8.8", "3-java11-8.8", "3.3.3-8.8", "3.3-8.8", "3-8.8"] - # - ["3.3.3-java8-3", "3.3-java8-3", "3-java8-3"] + - ["3.3.3-java8-3", "3.3-java8-3", "3-java8-3"] - ["3.3.3-java11-3", "3.3-java11-3", "3-java11-3", "3.3.3-3", "3.3-3", "3-3"] - ["3.3.3-java8-23", "3.3-java8-23", "3-java8-23", "3.3.3-java8", "3.3-java8", "3-java8"] - ["3.3.3-java11-23", "3.3-java11-23", "3-java11-23", "3.3.3-23", "3.3-23", "3-23", "3.3.3", "3.3", "3", "latest"] - registry: [*ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD] + registry: [*ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD] test_config: # - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] # - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] -- Gitee From d9dab7f457a903de4ec13081fcc8016db70a61f2 Mon Sep 17 00:00:00 2001 From: Yichen Yan Date: Thu, 21 Sep 2023 17:14:30 +0800 Subject: [PATCH 08/11] Add ACR repositories. --- APPLICATION/spark/buildspec.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/APPLICATION/spark/buildspec.yml b/APPLICATION/spark/buildspec.yml index 04852d8..87762ed 100644 --- a/APPLICATION/spark/buildspec.yml +++ b/APPLICATION/spark/buildspec.yml @@ -5,8 +5,8 @@ baseos_version: &BASEOS_VERSION # 定义镜像仓库信息 repository_info: - dockerhub: &DOCKERHUB_PROD - acr: &ACR_PROD + acr_alinux: &ACR_ALINUX alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/spark + acr_anolis: &ACR_ANOLIS anolis-registry.cn-zhangjiakou.cr.aliyuncs.com/openanolis/spark t-one: workspace: &WORKSPACE container_ci_test @@ -45,7 +45,7 @@ images: - ["3.3.3-java11-3", "3.3-java11-3", "3-java11-3", "3.3.3-3", "3.3-3", "3-3"] - ["3.3.3-java8-23", "3.3-java8-23", "3-java8-23", "3.3.3-java8", "3.3-java8", "3-java8"] - ["3.3.3-java11-23", "3.3-java11-23", "3-java11-23", "3.3.3-23", "3.3-23", "3-23", "3.3.3", "3.3", "3", "latest"] - registry: [*ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD] + registry: [*ACR_ALINUX, *ACR_ALINUX, *ACR_ANOLIS, *ACR_ANOLIS] test_config: # - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] # - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '')] -- Gitee From df3cc5632ad472473b4c5e493cc5b00f2b0cbf60 Mon Sep 17 00:00:00 2001 From: Yichen Yan Date: Wed, 27 Sep 2023 16:11:56 +0800 Subject: [PATCH 09/11] Fix repository. --- APPLICATION/spark/buildspec.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/APPLICATION/spark/buildspec.yml b/APPLICATION/spark/buildspec.yml index 87762ed..2a5d879 100644 --- a/APPLICATION/spark/buildspec.yml +++ b/APPLICATION/spark/buildspec.yml @@ -5,8 +5,8 @@ baseos_version: &BASEOS_VERSION # 定义镜像仓库信息 repository_info: - acr_alinux: &ACR_ALINUX alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/spark - acr_anolis: &ACR_ANOLIS anolis-registry.cn-zhangjiakou.cr.aliyuncs.com/openanolis/spark + acr_alinux: &ACR_ALINUX alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3 + acr_anolis: &ACR_ANOLIS anolis-registry.cn-zhangjiakou.cr.aliyuncs.com/openanolis t-one: workspace: &WORKSPACE container_ci_test -- Gitee From e09e0776fc239042e75115898b81936b78a9bd7e Mon Sep 17 00:00:00 2001 From: Yichen Yan Date: Thu, 12 Oct 2023 12:04:18 +0800 Subject: [PATCH 10/11] Add `JAVA_HOME` env to reduce runtime detect. --- APPLICATION/spark/general/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/APPLICATION/spark/general/Dockerfile b/APPLICATION/spark/general/Dockerfile index 627de04..841f828 100644 --- a/APPLICATION/spark/general/Dockerfile +++ b/APPLICATION/spark/general/Dockerfile @@ -35,6 +35,8 @@ LABEL org.opencontainers.image.title="Spark" \ org.opencontainers.image.version="${SPARK_VERSION}-${OS_SUFFIX}" ENV SPARK_VERSION ${SPARK_VERSION} +ENV JAVA_HOME /etc/alternatives/jre +ENV PATH $JAVA_HOME/bin:$PATH RUN set -eux; \ yum install -y net-tools iputils hostname; \ @@ -49,6 +51,7 @@ RUN set -eux; \ echo unsupported java version: ${JAVA_VERSION}; exit 1 \ ;; \ esac; \ + # (java -XshowSettings:properties -version 2>&1 > /dev/null | grep 'java.home' | awk '{print $3}' | xargs -I{} ln -s {} ${JAVA_HOME}); \ mkdir -p /opt/spark; \ mkdir -p /opt/spark/examples; \ mkdir -p /opt/spark/work-dir; \ -- Gitee From b7ac4d61e7690144aca0880db2f793f639a7f13a Mon Sep 17 00:00:00 2001 From: Yichen Yan Date: Fri, 13 Oct 2023 10:45:47 +0800 Subject: [PATCH 11/11] Change permission when copy. --- APPLICATION/spark/general/Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/APPLICATION/spark/general/Dockerfile b/APPLICATION/spark/general/Dockerfile index 841f828..b5152b0 100644 --- a/APPLICATION/spark/general/Dockerfile +++ b/APPLICATION/spark/general/Dockerfile @@ -58,16 +58,19 @@ RUN set -eux; \ touch /opt/spark/RELEASE; \ echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su; \ chgrp root /etc/passwd && chmod ug+rw /etc/passwd; \ - yum clean all + yum clean all; \ + groupadd --system --gid=${spark_uid} spark; \ + useradd --system --uid=${spark_uid} --gid=spark spark; \ + chown -R spark:spark /opt/spark -COPY --from=downloader /spark/jars /opt/spark/jars -COPY --from=downloader /spark/bin /opt/spark/bin -COPY --from=downloader /spark/sbin /opt/spark/sbin -COPY --from=downloader /spark/kubernetes/dockerfiles/spark/entrypoint.sh /opt/ -COPY --from=downloader /spark/kubernetes/dockerfiles/spark/decom.sh /opt/ -COPY --from=downloader /spark/examples /opt/spark/examples -COPY --from=downloader /spark/kubernetes/tests /opt/spark/tests -COPY --from=downloader /spark/data /opt/spark/data +COPY --from=downloader --chown=spark:spark /spark/jars /opt/spark/jars +COPY --from=downloader --chown=spark:spark /spark/bin /opt/spark/bin +COPY --from=downloader --chown=spark:spark /spark/sbin /opt/spark/sbin +COPY --from=downloader --chown=spark:spark /spark/kubernetes/dockerfiles/spark/entrypoint.sh /opt/ +COPY --from=downloader --chown=spark:spark /spark/kubernetes/dockerfiles/spark/decom.sh /opt/ +COPY --from=downloader --chown=spark:spark /spark/examples /opt/spark/examples +COPY --from=downloader --chown=spark:spark /spark/kubernetes/tests /opt/spark/tests +COPY --from=downloader --chown=spark:spark /spark/data /opt/spark/data ENV SPARK_HOME /opt/spark ENV PATH ${SPARK_HOME}/bin:${PATH} @@ -75,9 +78,6 @@ ENV PATH ${SPARK_HOME}/bin:${PATH} WORKDIR /opt/spark/work-dir RUN set -eux; \ - groupadd --system --gid=${spark_uid} spark; \ - useradd --system --uid=${spark_uid} --gid=spark spark; \ - chown -R spark:spark /opt/spark; \ chmod g+w /opt/spark/work-dir; \ chmod a+x /opt/decom.sh -- Gitee