citest (#22)

secretflow · Apr 25, 2024 · 6005464 · 6005464
1 parent 048c147
commit 6005464
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -62,16 +62,18 @@ jobs:
             #login docker
             docker login -u ${DOCKER_USERNAME} -p ${DOCKER_DEPLOY_TOKEN}
             
-            docker buildx build -t ${IMG_LATEST} --platform linux/arm64,linux/amd64 -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push
-            docker buildx build -t ${IMG_TAG} --platform linux/arm64,linux/amd64 -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push
-            
+            docker buildx build -t ${IMG_LATEST} --platform linux/amd64 --build-arg ARCH=amd64  -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push
+            docker buildx build -t ${IMG_LATEST} --platform linux/arm64 --build-arg ARCH=arm64  -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push
+            docker buildx build -t ${IMG_TAG} --platform linux/amd64 --build-arg ARCH=amd64  -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push
+            docker buildx build -t ${IMG_TAG} --platform linux/arm64 --build-arg ARCH=arm64  -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push           
             
             # login docker - aliyun
             docker login -u ${ALIYUN_DOCKER_USERNAME} -p ${ALIYUN_DOCKER_PASSWORD} secretflow-registry.cn-hangzhou.cr.aliyuncs.com
-            docker buildx build -t {ALIYUN_IMG_LATEST} --platform linux/amd64,linux/arm64 -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push
-            docker buildx build -t {ALIYUN_IMG_TAG} --platform linux/amd64,linux/arm64 -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push
-
-
+            
+            docker buildx build -t ${ALIYUN_IMG_LATEST} --platform linux/amd64 --build-arg ARCH=amd64  -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push
+            docker buildx build -t ${ALIYUN_IMG_LATEST} --platform linux/arm64 --build-arg ARCH=arm64  -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push
+            docker buildx build -t ${ALIYUN_IMG_TAG} --platform linux/amd64 --build-arg ARCH=amd64  -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push
+            docker buildx build -t ${ALIYUN_IMG_TAG} --platform linux/arm64 --build-arg ARCH=arm64  -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile . --push           
 
 
 # Orchestrate jobs using workflows

diff --git a/Makefile b/Makefile
@@ -75,4 +75,4 @@ clean:
 
 .PHONY: image
 image: build-envoy
-	docker build -t ${IMG} -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile .
+	docker build -t ${IMG} --build-arg ARCH=${ARCH} -f ./build_image/dockerfile/kuscia-envoy-anolis.Dockerfile .
diff --git a/build_image/dockerfile/kuscia-envoy-anolis.Dockerfile b/build_image/dockerfile/kuscia-envoy-anolis.Dockerfile
@@ -1,12 +1,12 @@
 FROM openanolis/anolisos:8.8
 
-ARG TARGETPLATFORM
+ARG ARCH
 
 ENV TZ=Asia/Shanghai
 
 ARG ROOT_DIR="/home/kuscia"
 
-COPY ./output/$TARGETPLATFORM $ROOT_DIR/
+COPY ./output/linux/$ARCH $ROOT_DIR/
 
 WORKDIR ${ROOT_DIR}