diff --git a/environment.sh b/environment.sh index 4e4d945..d79323e 100644 --- a/environment.sh +++ b/environment.sh @@ -194,27 +194,35 @@ export SKY_AOP=106.15.229.178:11800 export OIDC_SERVER_NAME=OIDC-SERVER${DOMAIN} export OIDC_SERVER_IMAGE=${REGISTRY_HOST}oidcserver:${DOMAIN} export OIDC_SERVER_JAR=tuoheng_oidc_server.jar -export OIDC_SERVER_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/oidcservice/${OIDC_SERVER_JAR} +if [ -z "$OIDC_SERVER_REMOTE_JAR" ]; then + export OIDC_SERVER_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/oidcservice/${OIDC_SERVER_JAR} +fi export OIDC_SERVER_MEMORY=1g #OIDCAdmin 配置 export OIDC_ADMIN_NAME=OIDC-ADMIN${DOMAIN} export OIDC_ADMIN_IMAGE=${REGISTRY_HOST}oidcadmin:${DOMAIN}${VERSION} export OIDC_ADMIN_JAR=tuoheng_oidc_admin.jar -export OIDC_ADMIN_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/oidcadmin/${OIDC_ADMIN_JAR} +if [ -z "$OIDC_ADMIN_REMOTE_JAR" ]; then + export OIDC_ADMIN_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/oidcadmin/${OIDC_ADMIN_JAR} +fi export OIDC_ADMIN_MEMORY=1g #网关配置 export GATEWAY_NAME=GATEWAY${DOMAIN} export GATEWAY_IMAGE=${REGISTRY_HOST}gateway:${DOMAIN}${VERSION} export GATEWAY_JAR=tuoheng_gateway.jar -export GATEWAY_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/gateway/${GATEWAY_JAR} +if [ -z "$GATEWAY_REMOTE_JAR" ]; then + export GATEWAY_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/gateway/${GATEWAY_JAR} +fi export GATEWAY_MEMORY=1g #流媒体录制配置 export STREAM_NAME=STREAM export STREAM_IMAGE=${REGISTRY_HOST}stream:${DOMAIN}${VERSION} -export STREAM_REMOTE_JAR=/Users/sunpeng/workspace/ideaproject/stream_server/target/stream_server-0.0.1-SNAPSHOT.jar +if [ -z "$STREAM_REMOTE_JAR" ]; then + export STREAM_REMOTE_JAR=/Users/sunpeng/workspace/ideaproject/stream_server/target/stream_server-0.0.1-SNAPSHOT.jar +fi export STREAM_MEMORY=1g export STREAM_JAR=stream_server-0.0.1-SNAPSHOT.jar export STREAM_DATA=${NETWORK}_stream_data @@ -223,7 +231,9 @@ export STREAM_DATA=${NETWORK}_stream_data export HHZ_API_NAME=HHZ-API${DOMAIN} export HHZ_API_IMAGE=${REGISTRY_HOST}hhzapi:${DOMAIN}${VERSION} export HHZ_API_JAR=tuoheng_hhz_api.jar -export HHZ_API_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/hhz-api/${HHZ_API_JAR} +if [ -z "$HHZ_API_REMOTE_JAR" ]; then + export HHZ_API_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/hhz-api/${HHZ_API_JAR} +fi export HHZ_API_MEMORY=1g #河湖长 @@ -234,7 +244,6 @@ export HHZ_ADMIN_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/hhz-admin/$ export HHZ_ADMIN_MEMORY=1g if [ -z "${HHZ_ADMIN_WEB_DIST}" ]; then export HHZ_ADMIN_WEB_DIST=/Users/sunpeng/workspace/remote/tuoheng_hhz_web/dist - echo "环境变量 HHZ_ADMIN_WEB_DIST 未设置,设置为默认值 ${HHZ_ADMIN_WEB_DIST}" fi @@ -244,11 +253,9 @@ export AIRPORT_IMAGE=${REGISTRY_HOST}airport:${DOMAIN}${VERSION} export AIRPORT_JAR=tuoheng_airport_admin.jar if [ -z "${AIRPORT_REMOTE_JAR}" ]; then export AIRPORT_REMOTE_JAR=/Users/sunpeng/workspace/remote/tuoheng_airport/tuoheng-admin/target/${AIRPORT_JAR} - echo "环境变量 AIRPORT_REMOTE_JAR 未设置,设置为默认值 ${AIRPORT_REMOTE_JAR}" fi if [ -z "${AIRPORT_WEB_DIST}" ]; then export AIRPORT_WEB_DIST=/Users/sunpeng/workspace/remote/docker/tuoheng_airport_web/dist - echo "环境变量 AIRPORT_WEB_DIST 未设置,设置为默认值 ${AIRPORT_WEB_DIST}" fi export AIRPORT_MEMORY=1g @@ -256,42 +263,53 @@ export AIRPORT_MEMORY=1g export BUSINESS_NAME=BUSINESS${DOMAIN} export BUSINESS_IMAGE=${REGISTRY_HOST}business:${DOMAIN}${VERSION} export BUSINESS_JAR=tuoheng_business_admin.jar -export BUSINESS_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/business/${BUSINESS_JAR} +if [ -z "${BUSINESS_REMOTE_JAR}" ]; then + export BUSINESS_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/business/${BUSINESS_JAR} +fi export BUSINESS_MEMORY=512m export DSP_API_NAME=DSP-API${DOMAIN} export DSP_API_IMAGE=${REGISTRY_HOST}dspapi:${DOMAIN}${VERSION} export DSP_API_JAR=tuoheng_dsp_api.jar -export DSP_API_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-api/${DSP_API_JAR} +if [ -z "${DSP_API_REMOTE_JAR}" ]; then + export DSP_API_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-api/${DSP_API_JAR} +fi export DSP_API_MEMORY=1g export DSP_ADMIN_NAME=DSP-ADMIN${DOMAIN} export DSP_ADMIN_IMAGE=${REGISTRY_HOST}dspadmin:${DOMAIN}${VERSION} export DSP_ADMIN_JAR=tuoheng_dsp_admin.jar -export DSP_ADMIN_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-admin/${DSP_ADMIN_JAR} +if [ -z "${DSP_ADMIN_REMOTE_JAR}" ]; then + export DSP_ADMIN_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-admin/${DSP_ADMIN_JAR} +fi export DSP_ADMIN_MEMORY=512m if [ -z "${DSP_ADMIN_WEB_DIST}" ]; then export DSP_ADMIN_WEB_DIST=/Users/sunpeng/workspace/empty - echo "环境变量 DSP_ADMIN_WEB_DIST 未设置,设置为默认值 ${DSP_ADMIN_WEB_DIST}" fi export DSP_INSPECTION_NAME=DSP-INSPECTION${DOMAIN} export DSP_INSPECTION_IMAGE=${REGISTRY_HOST}dspinspection:${DOMAIN}${VERSION} export DSP_INSPECTION_JAR=tuoheng_dsp_inspection.jar -export DSP_INSPECTION_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-inspection/${DSP_INSPECTION_JAR} +if [ -z "${DSP_INSPECTION_REMOTE_JAR}" ]; then + export DSP_INSPECTION_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-inspection/${DSP_INSPECTION_JAR} +fi export DSP_INSPECTION_MEMORY=512m export DSP_MINI_NAME=DSP-MINI${DOMAIN} export DSP_MINI_IMAGE=${REGISTRY_HOST}dspmini:${DOMAIN}${VERSION} export DSP_MINI_JAR=tuoheng_dsp_miniprogram.jar -export DSP_MINI_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-mini/${DSP_MINI_JAR} +if [ -z "${DSP_MINI_REMOTE_JAR}" ]; then + export DSP_MINI_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-mini/${DSP_MINI_JAR} +fi export DSP_MINI_MEMORY=512m export DSP_PORTAL_NAME=DSP-PORTAL${DOMAIN} export DSP_PORTAL_IMAGE=${REGISTRY_HOST}dspportal:${DOMAIN}${VERSION} export DSP_PORTAL_JAR=tuoheng_dsp_portal.jar -export DSP_PORTAL_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-portal/${DSP_PORTAL_JAR} +if [ -z "${DSP_PORTAL_REMOTE_JAR}" ]; then + export DSP_PORTAL_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-portal/${DSP_PORTAL_JAR} +fi export DSP_PORTAL_MEMORY=512m