diff --git a/start/airport.sh b/start/airport.sh index 57c21ad..afb8a35 100755 --- a/start/airport.sh +++ b/start/airport.sh @@ -33,7 +33,6 @@ if [ "$USEDAJIANG" = "true" ]; then --env MINIO_DAJIOSS_ENDPOINT=https://${MINIO_DOMAIN}:${NGINX_HTTPS_PORT} \ --env MINIO_OSS_ACCESSKEYID=${MINIO_ACCESS_KEY} \ --env MINIO_OSS_ACCESSKEYSECRET=${MINIO_SECRET_KEY} \ - --env SW_APP_NAME=${AIRPORT_NAME} \ --env SW_AGENT_COLLECTOR_BACKEND_SERVICES=AOPHOST:13800 \ --env SW_AGENT_NAME=AGENT_${AIRPORT_NAME} \ --env TZ=Asia/Shanghai \ @@ -72,7 +71,6 @@ else --env MINIO_DAJIOSS_ENDPOINT=https://${MINIO_DOMAIN}:${NGINX_HTTPS_PORT} \ --env MINIO_OSS_ACCESSKEYID=${MINIO_ACCESS_KEY} \ --env MINIO_OSS_ACCESSKEYSECRET=${MINIO_SECRET_KEY} \ - --env SW_APP_NAME=${AIRPORT_NAME} \ --env SW_AGENT_COLLECTOR_BACKEND_SERVICES=AOPHOST:13800 \ --env SW_AGENT_NAME=AGENT_${AIRPORT_NAME} \ --env TZ=Asia/Shanghai \ diff --git a/start/dspadmin.sh b/start/dspadmin.sh index 7ef839b..dc4b22c 100755 --- a/start/dspadmin.sh +++ b/start/dspadmin.sh @@ -11,6 +11,7 @@ fi docker run --pull always -d \ --name ${DSP_ADMIN_NAME} \ --network ${NETWORK} \ +--add-host AOPHOST:host-gateway \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${DSP_ADMIN_NAME} \ @@ -38,6 +39,8 @@ docker run --pull always -d \ --env MINIO_OSS_ACCESSKEYSECRET=${MINIO_SECRET_KEY} \ --env TUOHENG_PUSH_URL=rtmp://${SRS_DOMAIN}:${SRS_RTMP_PORT}/live/ \ --env TUOHENG_PULL_URL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/live/ \ +--env SW_AGENT_COLLECTOR_BACKEND_SERVICES=AOPHOST:13800 \ +--env SW_AGENT_NAME=AGENT_${DSP_ADMIN_NAME} \ --env TZ=Asia/Shanghai \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ --memory ${DSP_ADMIN_MEMORY} \ diff --git a/start/dspapi.sh b/start/dspapi.sh index a1521f7..bb2ba37 100755 --- a/start/dspapi.sh +++ b/start/dspapi.sh @@ -11,6 +11,7 @@ fi docker run --pull always -d \ --name ${DSP_API_NAME} \ --network ${NETWORK} \ +--add-host AOPHOST:host-gateway \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${DSP_API_NAME} \ @@ -38,6 +39,8 @@ docker run --pull always -d \ --env MINIO_OSS_ACCESSKEYSECRET=${MINIO_SECRET_KEY} \ --env TUOHENG_PUSH_URL=rtmp://${SRS_DOMAIN}:${SRS_RTMP_PORT}/live/ \ --env TUOHENG_PULL_URL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/live/ \ +--env SW_AGENT_COLLECTOR_BACKEND_SERVICES=AOPHOST:13800 \ +--env SW_AGENT_NAME=AGENT_${DSP_API_NAME} \ --env TZ=Asia/Shanghai \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ --memory ${DSP_API_MEMORY} \ diff --git a/start/hhzadmin.sh b/start/hhzadmin.sh index 810389c..10589cf 100755 --- a/start/hhzadmin.sh +++ b/start/hhzadmin.sh @@ -17,6 +17,7 @@ fi docker run --pull always -d \ --name ${HHZ_ADMIN_NAME} \ --network ${NETWORK} \ +--add-host AOPHOST:host-gateway \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${HHZ_ADMIN_NAME} \ @@ -45,6 +46,8 @@ docker run --pull always -d \ --env TUOHENG_DSP_CALLBACK_URL=https://${HHZ_DOMAIN_FULL}/hhz/admin/dsp/{requestId}/callback \ --env TUOHENG_DSP_DOMAIN_URL=https://${DSP_DOMAIN_FULL}/ \ --env TUOHENG_OIDC-URL=https://${OIDC_ADMIN_DOMAIN_FULL} \ +--env SW_AGENT_COLLECTOR_BACKEND_SERVICES=AOPHOST:13800 \ +--env SW_AGENT_NAME=AGENT_${HHZ_ADMIN_NAME} \ --env TZ=Asia/Shanghai \ --add-host ${OIDC_ADMIN_DOMAIN}:host-gateway \ --add-host ${DSP_DOMAIN}:host-gateway \ diff --git a/start/hhzapi.sh b/start/hhzapi.sh index 8919213..61db763 100755 --- a/start/hhzapi.sh +++ b/start/hhzapi.sh @@ -11,6 +11,7 @@ fi docker run --pull always -d \ --name ${HHZ_API_NAME} \ --network ${NETWORK} \ +--add-host AOPHOST:host-gateway \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${HHZ_API_NAME} \ @@ -38,6 +39,8 @@ docker run --pull always -d \ --env MINIO_OSS_ACCESSKEYSECRET=${MINIO_SECRET_KEY} \ --env TUOHENG_DSP_DOMAIN_URL=http://${DSP_API_NAME}:9015/ \ --env TUOHENG_DSP_CALLBACK_URL=http://${HHZ_API_NAME}:9055/api/dsp/{requestId}/callback \ +--env SW_AGENT_COLLECTOR_BACKEND_SERVICES=AOPHOST:13800 \ +--env SW_AGENT_NAME=AGENT_${HHZ_API_NAME} \ --env TZ=Asia/Shanghai \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ --memory ${HHZ_API_MEMORY} \ diff --git a/start/oidcservice.sh b/start/oidcservice.sh index ad8874a..e84f789 100755 --- a/start/oidcservice.sh +++ b/start/oidcservice.sh @@ -37,6 +37,9 @@ docker run --pull always -d \ --env TZ=Asia/Shanghai \ --env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:${KAFKA_PORT} \ --add-host ${OIDC_SERVER_DOMAIN}:host-gateway \ +--add-host AOPHOST:host-gateway \ +--env SW_AGENT_COLLECTOR_BACKEND_SERVICES=AOPHOST:13800 \ +--env SW_AGENT_NAME=AGENT_${OIDC_SERVER_NAME} \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ --memory ${OIDC_SERVER_MEMORY} \ --restart unless-stopped \