diff --git a/server/nginx.sh b/server/nginx.sh deleted file mode 100755 index 2dcf8d7..0000000 --- a/server/nginx.sh +++ /dev/null @@ -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 \ No newline at end of file diff --git a/server/oidcadmin.sh b/server/oidcadmin.sh deleted file mode 100755 index 2e7a8c0..0000000 --- a/server/oidcadmin.sh +++ /dev/null @@ -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} \ No newline at end of file diff --git a/server/oidcservice.sh b/server/oidcservice.sh deleted file mode 100755 index 2962158..0000000 --- a/server/oidcservice.sh +++ /dev/null @@ -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} \ No newline at end of file diff --git a/serviceImageBuilder/Dockerfile b/serviceImageBuilder/Dockerfile deleted file mode 100644 index 08a7663..0000000 --- a/serviceImageBuilder/Dockerfile +++ /dev/null @@ -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"] - \ No newline at end of file diff --git a/serviceImageBuilder/builder.sh b/serviceImageBuilder/builder.sh deleted file mode 100755 index 2c5cfee..0000000 --- a/serviceImageBuilder/builder.sh +++ /dev/null @@ -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 \ No newline at end of file diff --git a/serviceImageBuilder/gateway.sh b/serviceImageBuilder/gateway.sh deleted file mode 100755 index 5b96ff7..0000000 --- a/serviceImageBuilder/gateway.sh +++ /dev/null @@ -1,4 +0,0 @@ -source ../environment.sh -rm $GATEWAY_JAR -cp $GATEWAY_REMOTE_JAR $GATEWAY_JAR -./builder.sh $GATEWAY_NAME $GATEWAY_IMAGE $GATEWAY_JAR \ No newline at end of file diff --git a/serviceImageBuilder/oidcadmin.sh b/serviceImageBuilder/oidcadmin.sh deleted file mode 100755 index b688c13..0000000 --- a/serviceImageBuilder/oidcadmin.sh +++ /dev/null @@ -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 \ No newline at end of file diff --git a/serviceImageBuilder/oidcservice.sh b/serviceImageBuilder/oidcservice.sh deleted file mode 100755 index 3cc012a..0000000 --- a/serviceImageBuilder/oidcservice.sh +++ /dev/null @@ -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 \ No newline at end of file