From f7a8c8a88a6a496890899bfb4914bd2c7a240da0 Mon Sep 17 00:00:00 2001 From: somunslotus Date: Fri, 16 May 2025 16:49:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=84=E5=BB=BAarm=20dockerfile=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s/dockerfiles/auth-dockerfile | 4 +- k8s/dockerfiles/buildimage.sh | 13 ++++-- k8s/dockerfiles/conf/nginx.conf | 50 ++++++++++++------------ k8s/dockerfiles/file-dockerfile | 2 +- k8s/dockerfiles/gateway-dockerfile | 4 +- k8s/dockerfiles/job-dockerfile | 4 +- k8s/dockerfiles/managent-dockerfile | 4 +- k8s/dockerfiles/nginx-dockerfile | 2 +- k8s/dockerfiles/spring-oauth2-dockerfile | 17 ++++++++ k8s/dockerfiles/system-dockerfile | 4 +- k8s/dockerfiles/visual-dockerfile | 4 +- 11 files changed, 65 insertions(+), 43 deletions(-) mode change 100644 => 100755 k8s/dockerfiles/buildimage.sh create mode 100644 k8s/dockerfiles/spring-oauth2-dockerfile diff --git a/k8s/dockerfiles/auth-dockerfile b/k8s/dockerfiles/auth-dockerfile index c55fcb88..31a89ec5 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 ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm +#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/buildimage.sh b/k8s/dockerfiles/buildimage.sh old mode 100644 new mode 100755 index e714d6cc..eae0f5be --- a/k8s/dockerfiles/buildimage.sh +++ b/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 . + diff --git a/k8s/dockerfiles/conf/nginx.conf b/k8s/dockerfiles/conf/nginx.conf index 0d04beef..6b8dcd12 100644 --- a/k8s/dockerfiles/conf/nginx.conf +++ b/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"; diff --git a/k8s/dockerfiles/file-dockerfile b/k8s/dockerfiles/file-dockerfile index ce175dde..afd2c9aa 100644 --- a/k8s/dockerfiles/file-dockerfile +++ b/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 diff --git a/k8s/dockerfiles/gateway-dockerfile b/k8s/dockerfiles/gateway-dockerfile index d31960ff..04ef04f6 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 ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm +#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..ad591fd2 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 ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm +#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..c35f76ef 100644 --- a/k8s/dockerfiles/managent-dockerfile +++ b/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 diff --git a/k8s/dockerfiles/nginx-dockerfile b/k8s/dockerfiles/nginx-dockerfile index 42e9891a..fcf0cf53 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 ccr.ccs.tencentyun.com/somunslotus/nginx:latest-arm # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/spring-oauth2-dockerfile b/k8s/dockerfiles/spring-oauth2-dockerfile new file mode 100644 index 00000000..d26e1082 --- /dev/null +++ b/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" ] diff --git a/k8s/dockerfiles/system-dockerfile b/k8s/dockerfiles/system-dockerfile index c4d3cc80..82f4d5fb 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 ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm +#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..1aa12ed1 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 ccr.ccs.tencentyun.com/somunslotus/openjdk:8-jre-arm +#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi