xx

builder/hhzadmin.sh

@@ -0,0 +1,4 @@
+source ../environment.sh
+rm $HHZ_ADMIN_JAR
+cp $HHZ_ADMIN_REMOTE_JAR $HHZ_ADMIN_JAR
+./builder.sh $HHZ_ADMIN_NAME $HHZ_ADMIN_IMAGE $HHZ_ADMIN_JAR

builder/hhzapi.sh

@@ -0,0 +1,4 @@
+source ../environment.sh
+rm $HHZ_API_JAR
+cp $HHZ_API_REMOTE_JAR $HHZ_API_JAR
+./builder.sh $HHZ_API_NAME $HHZ_API_IMAGE $HHZ_API_JAR

environment.sh

@@ -128,6 +128,17 @@ export GATEWAY_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/gateway/${GAT
 export GATEWAY_MEMORY=512m
 
 
+export HHZ_API_NAME=HHZ_API_${DOMAIN}
+export HHZ_API_IMAGE=${REGISTRY_HOST}hhzapi:${DOMAIN}
+export HHZ_API_JAR=tuoheng_hhz_api.jar
+export HHZ_API_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/hhz-api/${HHZ_API_JAR}
+export HHZ_API_MEMORY=512m
+
+export HHZ_ADMIN_NAME=HHZ_ADMIN_${DOMAIN}
+export HHZ_ADMIN_IMAGE=${REGISTRY_HOST}hhzadmin:${DOMAIN}
+export HHZ_ADMIN_JAR=tuoheng_hhz_admin.jar
+export HHZ_ADMIN_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/hhz-admin/${HHZ_ADMIN_JAR}
+export HHZ_ADMIN_MEMORY=512m
 
 
 #主机INGRESS_PORT 映射到容器80 INGRESS_SSL_PORT 映射到容器 443

server/nginx.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-source ../environment.sh
-
-# 检查并停止/删除已存在的容器
-if docker ps -a | grep -q ${NGINX_NAME}; then
-    echo "停止并删除已存在的 ${NGINX_NAME} 容器..."
-    docker stop ${NGINX_NAME} >/dev/null 2>&1
-    docker rm ${NGINX_NAME} >/dev/null 2>&1
-fi
-
-# 启动Nginx容器
-docker run --pull always -d \
---name ${NGINX_NAME} \
---network ${NETWORK} \
--p ${NGINX_HTTP_PORT}:80 \
--p ${NGINX_HTTPS_PORT}:443 \
---env TZ=Asia/Shanghai \
---memory ${NGINX_MEMORY} \
---restart unless-stopped \
-${NGINX_IMAGE}
-
-# 显示运行中的容器
-docker ps 

server/oidcadmin.sh

@@ -1,29 +0,0 @@
-source ../environment.sh
- 
-
-if docker ps -a | grep -q ${OIDC_ADMIN_NAME}; then
-    echo "停止并删除已存在的 OIDC_ADMIN_NAME 容器..."
-    docker stop ${OIDC_ADMIN_NAME} >/dev/null 2>&1
-    docker rm ${OIDC_ADMIN_NAME} >/dev/null 2>&1
-fi
-
-
-docker run --pull always -d \
---name ${OIDC_ADMIN_NAME} \
---network ${NETWORK} \
---env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \
---env SPRING_CLOUD_CONSUL_PORT=${CONSUL_PORT} \
---env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${OIDC_ADMIN_NAME} \
---env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \
---env XXL_ENABLE=false \
---env SPRING_REDIS_HOST=${REDIS_NAME} \
---env SPRING_REDIS_PORT=6379 \
---env SPRING_DATASOURCE_URL="jdbc:mysql://${MYSQL_NAME}:3306/tuoheng_oidc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \
---env SPRING_DATASOURCE_USERNAME=root \
---env SPRING_DATASOURCE_PASSWORD=${MYSQL_ROOT_PASSWORD} \
---env TZ=Asia/Shanghai \
---env SPRING_KAFKA_COMMON_BOOTSTRAP-SERVERS=${KAFKA_NAME}:9092 \
---mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \
---memory ${OIDC_ADMIN_MEMORY} \
---restart unless-stopped \
-${OIDC_ADMIN_IMAGE}

server/oidcservice.sh

@@ -1,29 +0,0 @@
-source ../environment.sh
- 
-
-if docker ps -a | grep -q ${OIDC_SERVER_NAME}; then
-    echo "停止并删除已存在的 OIDC_SERVER_NAME 容器..."
-    docker stop ${OIDC_SERVER_NAME} >/dev/null 2>&1
-    docker rm ${OIDC_SERVER_NAME} >/dev/null 2>&1
-fi
-
-
-docker run --pull always -d \
---name ${OIDC_SERVER_NAME} \
---network ${NETWORK} \
---env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \
---env SPRING_CLOUD_CONSUL_PORT=${CONSUL_PORT} \
---env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${OIDC_SERVER_NAME} \
---env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \
---env XXL_ENABLE=false \
---env SPRING_REDIS_HOST=${REDIS_NAME} \
---env SPRING_REDIS_PORT=6379 \
---env SPRING_DATASOURCE_URL="jdbc:mysql://${MYSQL_NAME}:3306/tuoheng_oidc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \
---env SPRING_DATASOURCE_USERNAME=root \
---env SPRING_DATASOURCE_PASSWORD=${MYSQL_ROOT_PASSWORD} \
---env TZ=Asia/Shanghai \
---env SPRING_KAFKA_COMMON_BOOTSTRAP-SERVERS=${KAFKA_NAME}:9092 \
---mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \
---memory ${OIDC_SERVER_MEMORY} \
---restart unless-stopped \
-${OIDC_SERVER_IMAGE}

serviceImageBuilder/Dockerfile

@@ -1,22 +0,0 @@
-# 使用一个基础镜像
-#FROM openjdk:11-jre-slim
-FROM tuoheng/centos:base
-USER th
-# 定义构建参数
-ARG SW_APP_NAME
-ARG SW_SKY_AOP
-# 设置工作目录
-WORKDIR /data/java/tuoheng
-COPY apache-skywalking-java-agent-9.0.0.tgz  .
-RUN  tar -zxvf apache-skywalking-java-agent-9.0.0.tgz
-#复制应用程序到容器中
-COPY tuoheng.jar .
-# 设置环境变量
-ENV PATH="/usr/java/jdk/bin:${PATH}"
-ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="${SW_SKY_AOP}" \
-    SW_AGENT_NAME="${SW_APP_NAME}"
-#暴露应用程序的端口
-#EXPOSE 8090
-# 运行应用程序
-ENTRYPOINT ["java", "-Dfile.encoding=UTF-8","-javaagent:/data/java/tuoheng/skywalking-agent/skywalking-agent.jar","-jar","tuoheng.jar"]
-                                                                                                                                                                                                                                                                                                                                                                                            

serviceImageBuilder/builder.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-# This script builds the Docker image
-# 读取第一个参数
-if [ $# -ne 3 ]; then
-  echo "错误：调用该脚本时必须传入 3 个参数 分别为服务名 镜像名 包名"
-  exit 1
-fi
-echo "服务名: $1 Image $2 Java包: $3"
-rm tuoheng.jar
-cp $3 tuoheng.jar
-source ../environment.sh
-#docker service rm $APP_NAME
-sleep 5
-docker container prune -f
-sleep 5
-cp /data/java/apache-skywalking-java-agent-9.0.0.tgz apache-skywalking-java-agent-9.0.0.tgz
-docker image rm $2
-docker build --no-cache \
-  --build-arg SW_APP_NAME=$1 \
-  --build-arg SW_SKY_AOP=$SKY_AOP \
-  -t $2 .  # 注意末尾的 `.` 表示当前路径
-docker push $2                                                                                               

serviceImageBuilder/gateway.sh

@@ -1,4 +0,0 @@
-source ../environment.sh
-rm $GATEWAY_JAR
-cp $GATEWAY_REMOTE_JAR $GATEWAY_JAR
-./builder.sh $GATEWAY_NAME $GATEWAY_IMAGE $GATEWAY_JAR

serviceImageBuilder/oidcadmin.sh

@@ -1,4 +0,0 @@
-source ../environment.sh
-rm $OIDC_ADMIN_JAR
-cp $OIDC_ADMIN_REMOTE_JAR $OIDC_ADMIN_JAR
-./builder.sh $OIDC_ADMIN_NAME $OIDC_ADMIN_IMAGE $OIDC_ADMIN_JAR

serviceImageBuilder/oidcservice.sh

@@ -1,4 +0,0 @@
-source ../environment.sh
-rm $OIDC_SERVER_JAR
-cp $OIDC_SERVER_REMOTE_JAR $OIDC_SERVER_JAR
-./builder.sh $OIDC_SERVER_NAME $OIDC_SERVER_IMAGE $OIDC_SERVER_JAR