ci4s
/
ci4sManagement-cloud
Not watched
1
0
Fork 0
Code
Releases 1 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

修改镜像地址

dev-opt-cp
chenzhihang 11 months ago
parent
58a7f6b707
commit
a6ad764be9
15 changed files with 35 additions and 35 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      k8s/build.sh
  2. +12
    -12
      k8s/deploy.sh
  3. +7
    -7
      k8s/deploy.sh.bak
  4. +1
    -1
      k8s/dockerfiles/auth-dockerfile
  5. +1
    -1
      k8s/dockerfiles/file-dockerfile
  6. +1
    -1
      k8s/dockerfiles/gateway-dockerfile
  7. +1
    -1
      k8s/dockerfiles/gen-dockerfile
  8. +1
    -1
      k8s/dockerfiles/job-dockerfile
  9. +2
    -2
      k8s/dockerfiles/managent-dockerfile
  10. +1
    -1
      k8s/dockerfiles/nginx-dockerfile
  11. +1
    -1
      k8s/dockerfiles/system-dockerfile
  12. +1
    -1
      k8s/dockerfiles/visual-dockerfile
  13. +1
    -1
      k8s/template-yaml/k8s-13oauth2.yaml
  14. +2
    -2
      k8s/template-yaml/k8s-3nacos.yaml
  15. +1
    -1
      k8s/template-yaml/k8s-7management.yaml

+ 2
- 2
k8s/build.sh View File

@@ -54,7 +54,7 @@ compile_front() {
# 编译前端
docker run -v ${baseDir}:${baseDir} \
-e http_proxy=http://172.20.32.233:3128 -e https_proxy=http://172.20.32.233:3128 \
172.20.32.187/tempimagefile/node:18.16.0 ${baseDir}/k8s/build-node.sh
172.20.32.159/tempimagefile/node:18.16.0 ${baseDir}/k8s/build-node.sh
if [ $? -ne 0 ]; then
echo "编译失败，请检查代码！"
exit 1
@@ -73,7 +73,7 @@ compile_java() {
# 编译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
172.20.32.159/ci4s/build:v3 ${baseDir}/k8s/build-java.sh $param
if [ $? -ne 0 ]; then
echo "编译失败，请检查代码！"
exit 1


+ 12
- 12
k8s/deploy.sh View File

@@ -132,47 +132,47 @@ build_and_deploy() {
}

if [ "$service" == "front" ]; then
build_and_deploy "nginx-dockerfile" "172.20.32.187/ci4s/ci4s-front:${tag}" "k8s-12front.yaml"
build_and_deploy "nginx-dockerfile" "172.20.32.159/ci4s/ci4s-front:${tag}" "k8s-12front.yaml"
fi

# 构建和部署 manage 服务
if [ "$service" == "manage" ]; then
build_and_deploy "managent-dockerfile" "172.20.32.187/ci4s/ci4s-managent:${tag}" "k8s-7management.yaml"
build_and_deploy "managent-dockerfile" "172.20.32.159/ci4s/ci4s-managent:${tag}" "k8s-7management.yaml"
fi

if [ "$service" == "auth" ]; then
#部署认证中心
build_and_deploy "auth-dockerfile" "172.20.32.187/ci4s/ci4s-auth:${tag}" "k8s-5auth.yaml"
build_and_deploy "auth-dockerfile" "172.20.32.159/ci4s/ci4s-auth:${tag}" "k8s-5auth.yaml"
fi

if [ "$service" == "gateway" ]; then
#部署网关
build_and_deploy "gateway-dockerfile" "172.20.32.187/ci4s/ci4s-gateway:${tag}" "k8s-4gateway.yaml"
build_and_deploy "gateway-dockerfile" "172.20.32.159/ci4s/ci4s-gateway:${tag}" "k8s-4gateway.yaml"
fi

if [ "$service" == "system" ]; then
#部署系统服务
build_and_deploy "system-dockerfile" "172.20.32.187/ci4s/ci4s-system:${tag}" "k8s-6system.yaml"
build_and_deploy "system-dockerfile" "172.20.32.159/ci4s/ci4s-system:${tag}" "k8s-6system.yaml"
fi

# 构建和部署 front 服务
if [ "$service" == "manage-front" ]; then
build_and_deploy "nginx-dockerfile" "172.20.32.187/ci4s/ci4s-front:${tag}" "k8s-12front.yaml"
build_and_deploy "managent-dockerfile" "172.20.32.187/ci4s/ci4s-managent:${tag}" "k8s-7management.yaml"
build_and_deploy "nginx-dockerfile" "172.20.32.159/ci4s/ci4s-front:${tag}" "k8s-12front.yaml"
build_and_deploy "managent-dockerfile" "172.20.32.159/ci4s/ci4s-managent:${tag}" "k8s-7management.yaml"
fi


if [ "$service" == "all" ]; then
#部署前端
build_and_deploy "nginx-dockerfile" "172.20.32.187/ci4s/ci4s-front:${tag}" "k8s-12front.yaml"
build_and_deploy "nginx-dockerfile" "172.20.32.159/ci4s/ci4s-front:${tag}" "k8s-12front.yaml"
#部署管理平台
build_and_deploy "managent-dockerfile" "172.20.32.187/ci4s/ci4s-managent:${tag}" "k8s-7management.yaml"
build_and_deploy "managent-dockerfile" "172.20.32.159/ci4s/ci4s-managent:${tag}" "k8s-7management.yaml"
#部署认证中心
build_and_deploy "auth-dockerfile" "172.20.32.187/ci4s/ci4s-auth:${tag}" "k8s-5auth.yaml"
build_and_deploy "auth-dockerfile" "172.20.32.159/ci4s/ci4s-auth:${tag}" "k8s-5auth.yaml"
#部署网关
build_and_deploy "gateway-dockerfile" "172.20.32.187/ci4s/ci4s-gateway:${tag}" "k8s-4gateway.yaml"
build_and_deploy "gateway-dockerfile" "172.20.32.159/ci4s/ci4s-gateway:${tag}" "k8s-4gateway.yaml"
#部署系统服务
build_and_deploy "system-dockerfile" "172.20.32.187/ci4s/ci4s-system:${tag}" "k8s-6system.yaml"
build_and_deploy "system-dockerfile" "172.20.32.159/ci4s/ci4s-system:${tag}" "k8s-6system.yaml"
#部署配置中心
deploy_nacos "k8s-3nacos.yaml"
fi


+ 7
- 7
k8s/deploy.sh.bak View File

@@ -131,27 +131,27 @@ build_and_deploy() {

# 构建和部署 manage 服务
if [ "$service" == "manage-front" ] || [ "$service" == "manage" ]; then
build_and_deploy "managent-dockerfile" "172.20.32.187/ci4s/ci4s-managent:${tag}" "k8s-7management.yaml"
build_and_deploy "managent-dockerfile" "172.20.32.159/ci4s/ci4s-managent:${tag}" "k8s-7management.yaml"
fi


# 构建和部署 front 服务
if [ "$service" == "manage-front" ] || [ "$service" == "front" ]; then
build_and_deploy "nginx-dockerfile" "172.20.32.187/ci4s/ci4s-front:${tag}" "k8s-12front.yaml"
build_and_deploy "nginx-dockerfile" "172.20.32.159/ci4s/ci4s-front:${tag}" "k8s-12front.yaml"
fi


if [ "$service" == "all" ]; then
#部署前端
build_and_deploy "nginx-dockerfile" "172.20.32.187/ci4s/ci4s-front:${tag}" "k8s-12front.yaml"
build_and_deploy "nginx-dockerfile" "172.20.32.159/ci4s/ci4s-front:${tag}" "k8s-12front.yaml"
#部署管理平台
build_and_deploy "managent-dockerfile" "172.20.32.187/ci4s/ci4s-managent:${tag}" "k8s-7management.yaml"
build_and_deploy "managent-dockerfile" "172.20.32.159/ci4s/ci4s-managent:${tag}" "k8s-7management.yaml"
#部署认证中心
build_and_deploy "auth-dockerfile" "172.20.32.187/ci4s/ci4s-auth:${tag}" "k8s-5auth.yaml"
build_and_deploy "auth-dockerfile" "172.20.32.159/ci4s/ci4s-auth:${tag}" "k8s-5auth.yaml"
#部署网关
build_and_deploy "gateway-dockerfile" "172.20.32.187/ci4s/ci4s-gateway:${tag}" "k8s-4gateway.yaml"
build_and_deploy "gateway-dockerfile" "172.20.32.159/ci4s/ci4s-gateway:${tag}" "k8s-4gateway.yaml"
#部署系统服务
build_and_deploy "system-dockerfile" "172.20.32.187/ci4s/ci4s-system:${tag}" "k8s-6system.yaml"
build_and_deploy "system-dockerfile" "172.20.32.159/ci4s/ci4s-system:${tag}" "k8s-6system.yaml"
#部署配置中心
deploy_nacos "k8s-3nacos.yaml"
fi


+ 1
- 1
k8s/dockerfiles/auth-dockerfile View File

@@ -1,6 +1,6 @@
# 基础镜像
#FROM openjdk:8-jre
FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
FROM 172.20.32.159/ci4s/openjdk-dvc:2024829
# author
MAINTAINER ruoyi



+ 1
- 1
k8s/dockerfiles/file-dockerfile View File

@@ -1,5 +1,5 @@
# 基础镜像
FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
FROM 172.20.32.159/ci4s/openjdk-dvc:2024829
#FROM openjdk:8-jre
# author
MAINTAINER ruoyi


+ 1
- 1
k8s/dockerfiles/gateway-dockerfile View File

@@ -1,6 +1,6 @@
# 基础镜像
#FROM openjdk:8-jre
FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
FROM 172.20.32.159/ci4s/openjdk-dvc:2024829
# author
MAINTAINER ruoyi



+ 1
- 1
k8s/dockerfiles/gen-dockerfile View File

@@ -1,6 +1,6 @@
# 基础镜像
#FROM openjdk:8-jre
FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
FROM 172.20.32.159/ci4s/openjdk-dvc:2024829
# author
MAINTAINER ruoyi



+ 1
- 1
k8s/dockerfiles/job-dockerfile View File

@@ -1,6 +1,6 @@
# 基础镜像
#FROM openjdk:8-jre
FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
FROM 172.20.32.159/ci4s/openjdk-dvc:2024829
# author
MAINTAINER ruoyi



+ 2
- 2
k8s/dockerfiles/managent-dockerfile View File

@@ -1,6 +1,6 @@
# 基础镜像
#FROM 172.20.32.187/ci4s/openjdk:8u162
FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
#FROM 172.20.32.159/ci4s/openjdk:8u162
FROM 172.20.32.159/ci4s/openjdk-dvc:2024829
# author
MAINTAINER ruoyi



+ 1
- 1
k8s/dockerfiles/nginx-dockerfile View File

@@ -1,6 +1,6 @@
# 基础镜像
#FROM nginx:latest
FROM 172.20.32.187/ci4s/nginx:latest
FROM 172.20.32.159/ci4s/nginx:latest
# author
MAINTAINER ruoyi



+ 1
- 1
k8s/dockerfiles/system-dockerfile View File

@@ -1,6 +1,6 @@
# 基础镜像
#FROM openjdk:8-jre
FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
FROM 172.20.32.159/ci4s/openjdk-dvc:2024829
# author
MAINTAINER ruoyi



+ 1
- 1
k8s/dockerfiles/visual-dockerfile View File

@@ -1,6 +1,6 @@
# 基础镜像
#FROM openjdk:8-jre
FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
FROM 172.20.32.159/ci4s/openjdk-dvc:2024829
# author
MAINTAINER ruoyi



+ 1
- 1
k8s/template-yaml/k8s-13oauth2.yaml View File

@@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: ci4s-oauth2-authenticator
image: 172.20.32.187/ci4s/spring-oauth2-authenticator:latest
image: 172.20.32.159/ci4s/spring-oauth2-authenticator:latest
env:
- name: DB_URL
value: mysql.argo.svc:3306


+ 2
- 2
k8s/template-yaml/k8s-3nacos.yaml View File

@@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: nacos-ci4s
image: 172.20.32.187/ci4s/nacos-server:v2.2.0
image: 172.20.32.159/ci4s/nacos-server:v2.2.0
env:
- name: SPRING_DATASOURCE_PLATFORM
value: mysql
@@ -39,7 +39,7 @@ spec:
- containerPort: 9849
initContainers:
- name: init-mydb-check
image: 172.20.32.187/ci4s/busybox:1.31
image: 172.20.32.159/ci4s/busybox:1.31
command: [ 'sh', '-c', 'nc -zv mysql.argo.svc 3306' ]
restartPolicy: Always



+ 1
- 1
k8s/template-yaml/k8s-7management.yaml View File

@@ -36,7 +36,7 @@ spec:
path: /platform-data
initContainers:
- name: init-fs-check
image: 172.20.32.187/ci4s/ci4s-managent:202502141722
image: 172.20.32.159/ci4s/ci4s-managent:202502141722
securityContext:
privileged: true
volumeMounts:


Write Preview
Loading…
Cancel
Save