diff --git a/server/oidcadmin.sh b/server/oidcadmin.sh index cea7424..2e7a8c0 100755 --- a/server/oidcadmin.sh +++ b/server/oidcadmin.sh @@ -8,7 +8,7 @@ if docker ps -a | grep -q ${OIDC_ADMIN_NAME}; then fi -docker run -d \ +docker run --pull always -d \ --name ${OIDC_ADMIN_NAME} \ --network ${NETWORK} \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ @@ -18,7 +18,7 @@ docker run -d \ --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_airport?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \ +--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 \ @@ -26,6 +26,4 @@ docker run -d \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ --memory ${OIDC_ADMIN_MEMORY} \ --restart unless-stopped \ -${OIDC_ADMIN_IMAGE} - -docker ps \ No newline at end of file +${OIDC_ADMIN_IMAGE} \ No newline at end of file diff --git a/server/oidcservice.sh b/server/oidcservice.sh index b4afca5..2962158 100755 --- a/server/oidcservice.sh +++ b/server/oidcservice.sh @@ -8,7 +8,7 @@ if docker ps -a | grep -q ${OIDC_SERVER_NAME}; then fi -docker run -d \ +docker run --pull always -d \ --name ${OIDC_SERVER_NAME} \ --network ${NETWORK} \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ @@ -18,7 +18,7 @@ docker run -d \ --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_airport?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \ +--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 \ @@ -26,6 +26,4 @@ docker run -d \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ --memory ${OIDC_SERVER_MEMORY} \ --restart unless-stopped \ -${OIDC_SERVER_IMAGE} - -docker ps \ No newline at end of file +${OIDC_SERVER_IMAGE} \ No newline at end of file