diff --git a/backend/apprun.sh b/backend/apprun.sh index d66cfde..a005eea 100644 --- a/backend/apprun.sh +++ b/backend/apprun.sh @@ -192,16 +192,12 @@ run() { checkOrCreate_network containerLogPath=/usr/local/$COMPANY_NAME/logs PREFIX=${PROJECT_NAME##*-} - XXLJOB_LABEL="--label traefik.enable=true \ - --label traefik.http.routers.${PREFIX}-router.rule=PathPrefix(\`/${PREFIX}\`) \ - --label traefik.http.routers.${PREFIX}-router.entrypoints=xxljob \ - --label traefik.http.services.${PREFIX}-service.loadbalancer.server.port=9999" if [ -e "$(pwd)/.env" ];then - docker run -d -v /etc/localtime:/etc/localtime:ro --env-file .env $(port_map_processor) -v $LOG_PATH:$containerLogPath --network=$NETWORK_NAME $XXLJOB_LABEL --restart=always --name $PROJECT_NAME $latestImageId - echo "启动命令为: docker run -d -v /etc/localtime:/etc/localtime:ro --env-file .env $(port_map_processor) -v $LOG_PATH:$containerLogPath --network=$NETWORK_NAME $XXLJOB_LABEL --restart=always --name $PROJECT_NAME $latestImageId" + docker run -d -v /etc/localtime:/etc/localtime:ro -e XXLJOB_PREFIX=$PREFIX --env-file .env $(port_map_processor) -v $LOG_PATH:$containerLogPath --network=$NETWORK_NAME --restart=always --name $PROJECT_NAME $latestImageId + echo "启动命令为: docker run -d -v /etc/localtime:/etc/localtime:ro --env-file .env $(port_map_processor) -v $LOG_PATH:$containerLogPath --network=$NETWORK_NAME --restart=always --name $PROJECT_NAME $latestImageId" else - docker run -d -v /etc/localtime:/etc/localtime:ro -e JAVA_OPS="$JAVA_OPS" $(port_map_processor) -v $LOG_PATH:$containerLogPath --network=$NETWORK_NAME $XXLJOB_LABEL --restart=always --name $PROJECT_NAME $latestImageId - echo "启动命令为: docker run -d -v /etc/localtime:/etc/localtime:ro -e JAVA_OPS=\"$JAVA_OPS\" $(port_map_processor) -v $LOG_PATH:$containerLogPath --network=$NETWORK_NAME $XXLJOB_LABEL --restart=always --name $PROJECT_NAME $latestImageId" + docker run -d -v /etc/localtime:/etc/localtime:ro -e XXLJOB_PREFIX=$PREFIX -e JAVA_OPS="$JAVA_OPS" $(port_map_processor) -v $LOG_PATH:$containerLogPath --network=$NETWORK_NAME --restart=always --name $PROJECT_NAME $latestImageId + echo "启动命令为: docker run -d -v /etc/localtime:/etc/localtime:ro -e JAVA_OPS=\"$JAVA_OPS\" $(port_map_processor) -v $LOG_PATH:$containerLogPath --network=$NETWORK_NAME --restart=always --name $PROJECT_NAME $latestImageId" fi }