diff --git a/.circleci/config.yml b/.circleci/config.yml index 6b813c7..ea0a898 100644 --- 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 index 5820306..a9ded2e 100644 --- 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 index 2e303de..6c2af53 100644 --- 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}