diff --git a/Jenkinsfile b/Jenkinsfile index 6bcad2f..01fccfa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,10 +15,6 @@ pipeline { DOCKER_CREDS = 'harbor_key' TARGET_PLATFORMS = 'linux/amd64,linux/arm64' BUILDER_NAME = "liverecorder-buildx-${env.BUILD_ID}" - HTTP_PROXY = 'http://192.168.5.200:7890' - HTTPS_PROXY = 'http://192.168.5.200:7890' - NO_PROXY = '127.0.0.1,localhost,reg.nxsir.cn,gitea.nxsir.cn,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12' - NO_PROXY_DRIVER = '127.0.0.1\\,localhost\\,reg.nxsir.cn\\,gitea.nxsir.cn\\,192.168.0.0/16\\,10.0.0.0/8\\,172.16.0.0/12' GIT_REPO_URL = 'https://gitea.nxsir.cn/nanxun/live_recorder.git' GIT_BRANCH = 'main' @@ -84,9 +80,9 @@ pipeline { sudo docker buildx create \ --name ${BUILDER_NAME} \ --driver docker-container \ - --driver-opt "env.http_proxy=${HTTP_PROXY}" \ - --driver-opt "env.https_proxy=${HTTPS_PROXY}" \ - --driver-opt "env.no_proxy=${NO_PROXY_DRIVER}" \ + --driver-opt 'env.http_proxy=http://192.168.5.200:7890' \ + --driver-opt 'env.https_proxy=http://192.168.5.200:7890' \ + --driver-opt 'env.no_proxy=127.0.0.1\,localhost\,reg.nxsir.cn\,gitea.nxsir.cn\,192.168.0.0/16\,10.0.0.0/8\,172.16.0.0/12' \ --use fi sudo docker buildx inspect --builder ${BUILDER_NAME} --bootstrap >/dev/null @@ -97,12 +93,12 @@ pipeline { --pull \ --network host \ --provenance=false \ - --build-arg HTTP_PROXY=${HTTP_PROXY} \ - --build-arg HTTPS_PROXY=${HTTPS_PROXY} \ - --build-arg NO_PROXY=${NO_PROXY} \ - --build-arg http_proxy=${HTTP_PROXY} \ - --build-arg https_proxy=${HTTPS_PROXY} \ - --build-arg no_proxy=${NO_PROXY} \ + --build-arg HTTP_PROXY=http://192.168.5.200:7890 \ + --build-arg HTTPS_PROXY=http://192.168.5.200:7890 \ + --build-arg NO_PROXY=127.0.0.1,localhost,reg.nxsir.cn,gitea.nxsir.cn,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12 \ + --build-arg http_proxy=http://192.168.5.200:7890 \ + --build-arg https_proxy=http://192.168.5.200:7890 \ + --build-arg no_proxy=127.0.0.1,localhost,reg.nxsir.cn,gitea.nxsir.cn,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12 \ -f src/LiveRecorder.WebApi/Dockerfile \ -t ${API_IMAGE_TAGGED} \ -t ${API_IMAGE_LATEST} \ @@ -120,9 +116,9 @@ pipeline { sudo docker buildx create \ --name ${BUILDER_NAME} \ --driver docker-container \ - --driver-opt "env.http_proxy=${HTTP_PROXY}" \ - --driver-opt "env.https_proxy=${HTTPS_PROXY}" \ - --driver-opt "env.no_proxy=${NO_PROXY_DRIVER}" \ + --driver-opt 'env.http_proxy=http://192.168.5.200:7890' \ + --driver-opt 'env.https_proxy=http://192.168.5.200:7890' \ + --driver-opt 'env.no_proxy=127.0.0.1\,localhost\,reg.nxsir.cn\,gitea.nxsir.cn\,192.168.0.0/16\,10.0.0.0/8\,172.16.0.0/12' \ --use fi sudo docker buildx inspect --builder ${BUILDER_NAME} --bootstrap >/dev/null @@ -133,12 +129,12 @@ pipeline { --pull \ --network host \ --provenance=false \ - --build-arg HTTP_PROXY=${HTTP_PROXY} \ - --build-arg HTTPS_PROXY=${HTTPS_PROXY} \ - --build-arg NO_PROXY=${NO_PROXY} \ - --build-arg http_proxy=${HTTP_PROXY} \ - --build-arg https_proxy=${HTTPS_PROXY} \ - --build-arg no_proxy=${NO_PROXY} \ + --build-arg HTTP_PROXY=http://192.168.5.200:7890 \ + --build-arg HTTPS_PROXY=http://192.168.5.200:7890 \ + --build-arg NO_PROXY=127.0.0.1,localhost,reg.nxsir.cn,gitea.nxsir.cn,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12 \ + --build-arg http_proxy=http://192.168.5.200:7890 \ + --build-arg https_proxy=http://192.168.5.200:7890 \ + --build-arg no_proxy=127.0.0.1,localhost,reg.nxsir.cn,gitea.nxsir.cn,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12 \ -f frontend/Dockerfile \ --build-arg VITE_API_BASE_URL=/api \ -t ${WEB_IMAGE_TAGGED} \