构建arm dockerfile修改

k8s/dockerfiles/auth-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  openjdk:8-jre
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM  ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/buildimage.sh

@@ -6,8 +6,13 @@ url=$2
 echo "版本号为: $version"
 docker build -t $url/ci4s-gateway:$version -f gateway-dockerfile .
 docker build -t $url/ci4s-auth:$version -f auth-dockerfile .
-docker build -t $url/ci4s-file:$version -f file-dockerfile .
-docker build -t $url/ci4s-gen:$version -f gen-dockerfile .
-docker build -t $url/ci4s-job:$version -f job-dockerfile .
-docker build -t $url/ci4s-visual:$version -f visual-dockerfile .
+#docker build -t $url/ci4s-file:$version -f file-dockerfile .
+#docker build -t $url/ci4s-gen:$version -f gen-dockerfile .
+#docker build -t $url/ci4s-job:$version -f job-dockerfile .
+#docker build -t $url/ci4s-visual:$version -f visual-dockerfile .
 docker build -t $url/ci4s-system:$version -f system-dockerfile .
+docker build -t $url/ci4s-managent:$version -f managent-dockerfile .
+
+docker build -t $url/ci4s-front:$version -f nginx-dockerfile .
+docker build -t $url/ci4s-oauth2-authenticator:$version -f spring-oauth2-dockerfile .
+

k8s/dockerfiles/conf/nginx.conf

@@ -27,26 +27,26 @@ http {
             proxy_send_timeout 500s;     # 设置发送超时时间为 120 秒
         }
         
-        location /label-studio/ {
+	#        location /label-studio/ {
            # rewrite ^/label-studio/(.*)$ /$1 break;
-           proxy_pass http://label-studio-service.argo.svc:9000/projects/;
-           proxy_hide_header X-Frame-Options;
-           add_header X-Frame-Options ALLOWALL;
-        }
-
-        location /minio/ {
-                   # rewrite ^/label-studio/(.*)$ /$1 break;
-                   proxy_pass http://juicefs-s3-gateway.juicefs.svc:9000/;
-                   proxy_hide_header X-Frame-Options;
-                   add_header X-Frame-Options ALLOWALL;
-                }
-
-        location /neo4j/ {
-                   # rewrite ^/label-studio/(.*)$ /$1 break;
-                   proxy_pass http://172.20.20.88:7474/;
-                   proxy_hide_header X-Frame-Options;
-                   add_header X-Frame-Options ALLOWALL;
-                }
+	#   proxy_pass http://label-studio-service.argo.svc:9000/projects/;
+	#   proxy_hide_header X-Frame-Options;
+	#   add_header X-Frame-Options ALLOWALL;
+	#}
+
+	#location /minio/ {
+	#           # rewrite ^/label-studio/(.*)$ /$1 break;
+	#           proxy_pass http://juicefs-s3-gateway.juicefs.svc:9000/;
+	#           proxy_hide_header X-Frame-Options;
+	#           add_header X-Frame-Options ALLOWALL;
+	#        }
+
+		# location /neo4j/ {
+		#   # rewrite ^/label-studio/(.*)$ /$1 break;
+		#   proxy_pass http://172.20.20.88:7474/;
+		#   proxy_hide_header X-Frame-Options;
+		#   add_header X-Frame-Options ALLOWALL;
+		#}
 
         location / {
             rewrite ^/prod-api/(.*)$ /$1 break;
@@ -55,11 +55,11 @@ http {
             index  index.html index.htm;
         }
         
-       location /api/v1/model/ {
-            proxy_pass http://pipeline-convert-service.argo.svc:80;
-            proxy_set_header REMOTE-HOST $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-       }
+	#    location /api/v1/model/ {
+	#    proxy_pass http://pipeline-convert-service.argo.svc:80;
+	#    proxy_set_header REMOTE-HOST $remote_addr;
+	#    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	#}
   #    location /api/v1/realtimeStatus {
   #          proxy_pass http://argo-server.argo.svc:2746/api/v1/workflow-events/argo;
   #          proxy_set_header REMOTE-HOST $remote_addr;
@@ -118,7 +118,7 @@ http {
 
        
        location /newlog/realtimeLog {
- 	   proxy_pass http://loki.loki-log.svc:3100/loki/api/v1/tail;
+	       # proxy_pass http://loki.loki-log.svc:3100/loki/api/v1/tail;
     	   proxy_http_version 1.1;
     	   proxy_set_header Upgrade $http_upgrade;
     	   proxy_set_header Connection "Upgrade";

k8s/dockerfiles/file-dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm
 #FROM  openjdk:8-jre
 # author
 MAINTAINER ruoyi

k8s/dockerfiles/gateway-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  openjdk:8-jre
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/job-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  openjdk:8-jre
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM  ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/managent-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  172.20.32.187/ci4s/openjdk:8u162
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM  ccr.ccs.tencentyun.com/somunslotus/jdk:20241025-arm
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/nginx-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
 #FROM nginx:latest
-FROM 172.20.32.187/ci4s/nginx:latest
+FROM ccr.ccs.tencentyun.com/somunslotus/nginx:latest-arm
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/spring-oauth2-dockerfile

@@ -0,0 +1,17 @@
+# 基础镜像
+FROM  ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm
+# author
+LABEL  maintainer=ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+EXPOSE 8080
+ENV JAVA_OPTS=""
+# 复制jar文件到路径
+COPY ./jar/spring-oauth2-authenticator-1.0-SNAPSHOT.jar  /home/ruoyi/app.jar
+# 启动认证服务
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar app.jar" ]

k8s/dockerfiles/system-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  openjdk:8-jre
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/visual-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  openjdk:8-jre
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM  ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi