diff --git a/k8s/build-java.sh b/k8s/build-java.sh index 7bb2180b..f9c68888 100755 --- a/k8s/build-java.sh +++ b/k8s/build-java.sh @@ -1,6 +1,6 @@ #!/bin/bash -baseDir="/home/somuns/ci4s" +baseDir="/data/code" #判断$1是否为all,如果是,则编译所有模块,否则只编译management-platform模块 diff --git a/k8s/build-node.sh b/k8s/build-node.sh index df353aa4..653f7723 100755 --- a/k8s/build-node.sh +++ b/k8s/build-node.sh @@ -1,11 +1,9 @@ #!/bin/bash -baseDir="/home/somuns/ci4s" +baseDir="/data/code" cd ${baseDir}/react-ui npm config set registry https://registry.npmmirror.com/ -npm config set proxy http://172.20.32.253:3128 -npm config set https-proxy http://172.20.32.253:3128 npm install --force diff --git a/k8s/build.sh b/k8s/build.sh index a84e56f1..0dce400d 100755 --- a/k8s/build.sh +++ b/k8s/build.sh @@ -38,7 +38,7 @@ if [[ ! " ${valid_services[@]} " =~ " $service " ]]; then fi # 登录到目标环境 -baseDir="/home/somuns/ci4s" +baseDir="/data/code" cd ${baseDir} # 拉取指定分支的最新代码 @@ -72,8 +72,7 @@ compile_front() { # 编译前端 docker run -v ${baseDir}:${baseDir} \ - -e http_proxy=http://172.20.32.253:3128 -e https_proxy=http://172.20.32.253:3128 \ - 172.20.32.187/ci4s/node:16.16.0 ${baseDir}/k8s/build-node.sh + node:16.16.0 ${baseDir}/k8s/build-node.sh if [ $? -ne 0 ]; then echo "编译失败,请检查代码!" exit 1 @@ -90,9 +89,8 @@ compile_front() { compile_java() { param=$1 # 编译java - docker run -v ${baseDir}:${baseDir} -v /home/maven:/home/maven \ - -e http_proxy=http://172.20.32.253:3128 -e https_proxy=http://172.20.32.253:3128 \ - 172.20.32.187/ci4s/build:v3 ${baseDir}/k8s/build-java.sh $param + docker run -v ${baseDir}:${baseDir} -v /home/maven:/root/.m2/repository \ + maven:3.9 ${baseDir}/k8s/build-java.sh $param if [ $? -ne 0 ]; then echo "编译失败,请检查代码!" exit 1 diff --git a/k8s/build_and_deploy.sh b/k8s/build_and_deploy.sh index eacc9c6b..c18d076b 100755 --- a/k8s/build_and_deploy.sh +++ b/k8s/build_and_deploy.sh @@ -4,7 +4,7 @@ startTime=$(date +%s) # 登录到目标环境 -baseDir="/home/somuns/ci4s" +baseDir="/data/code" cd ${baseDir} diff --git a/k8s/dockerfiles/auth-dockerfile b/k8s/dockerfiles/auth-dockerfile index c55fcb88..ee0514c3 100644 --- a/k8s/dockerfiles/auth-dockerfile +++ b/k8s/dockerfiles/auth-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 -#FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 +FROM openjdk:8-jre +#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/file-dockerfile b/k8s/dockerfiles/file-dockerfile index ce175dde..4c6dd2c3 100644 --- a/k8s/dockerfiles/file-dockerfile +++ b/k8s/dockerfiles/file-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 -FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 -#FROM openjdk:8-jre +#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 +FROM openjdk:8-jre # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/gateway-dockerfile b/k8s/dockerfiles/gateway-dockerfile index d31960ff..c390f53f 100644 --- a/k8s/dockerfiles/gateway-dockerfile +++ b/k8s/dockerfiles/gateway-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 -#FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 +FROM openjdk:8-jre +#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/gen-dockerfile b/k8s/dockerfiles/gen-dockerfile index 0982cf6b..e8788ef9 100644 --- a/k8s/dockerfiles/gen-dockerfile +++ b/k8s/dockerfiles/gen-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 -#FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 +FROM openjdk:8-jre +#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/job-dockerfile b/k8s/dockerfiles/job-dockerfile index 2b8d026e..52c853ce 100644 --- a/k8s/dockerfiles/job-dockerfile +++ b/k8s/dockerfiles/job-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 -#FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 +FROM openjdk:8-jre +#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/managent-dockerfile b/k8s/dockerfiles/managent-dockerfile index 138dc8b5..109a3453 100644 --- a/k8s/dockerfiles/managent-dockerfile +++ b/k8s/dockerfiles/managent-dockerfile @@ -1,6 +1,7 @@ # 基础镜像 +FROM openjdk:8-jre #FROM 172.20.32.187/ci4s/openjdk:8u162 -FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 +#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/nginx-dockerfile b/k8s/dockerfiles/nginx-dockerfile index 42e9891a..290aea77 100644 --- a/k8s/dockerfiles/nginx-dockerfile +++ b/k8s/dockerfiles/nginx-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 -#FROM nginx:latest -FROM 172.20.32.187/ci4s/nginx:latest +FROM nginx:latest +#FROM 172.20.32.187/ci4s/nginx:latest # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/system-dockerfile b/k8s/dockerfiles/system-dockerfile index c4d3cc80..280e5b11 100644 --- a/k8s/dockerfiles/system-dockerfile +++ b/k8s/dockerfiles/system-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 -#FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 +FROM openjdk:8-jre +#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/visual-dockerfile b/k8s/dockerfiles/visual-dockerfile index 3a96fa3a..c154d54c 100644 --- a/k8s/dockerfiles/visual-dockerfile +++ b/k8s/dockerfiles/visual-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 -#FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 +FROM openjdk:8-jre +#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi