diff --git a/environment.sh b/environment.sh index 21a0354..93b087e 100644 --- a/environment.sh +++ b/environment.sh @@ -92,7 +92,7 @@ export XXLJOB_MEMORY=512m export XXLJOB_ACCESS_TOKEN=default_token -export SKY_AOP="sky-oap:11800" +export SKY_AOP=${SKYWALKING_OAP_NAME}:11800 #主机INGRESS_PORT 映射到容器80 INGRESS_SSL_PORT 映射到容器 443 export INGRESS_PORT=80 #export INGRESS_SSL_PORT=443 diff --git a/serviceImageBuilder/builder.sh b/serviceImageBuilder/builder.sh index a43290f..2c5cfee 100755 --- a/serviceImageBuilder/builder.sh +++ b/serviceImageBuilder/builder.sh @@ -1,23 +1,22 @@ #!/bin/bash # This script builds the Docker image # 读取第一个参数 -if [ $# -ne 2 ]; then - echo "错误:调用该脚本时必须传入 2 个参数。" +if [ $# -ne 3 ]; then + echo "错误:调用该脚本时必须传入 3 个参数 分别为服务名 镜像名 包名" exit 1 fi -echo "服务名: $1 Java包: $2" +echo "服务名: $1 Image $2 Java包: $3" rm tuoheng.jar -cp $2 tuoheng.jar +cp $3 tuoheng.jar source ../environment.sh -export APP_NAME=$1 #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 $REGISTRY/tuoheng/$APP_NAME:$DOMAIN +docker image rm $2 docker build --no-cache \ - --build-arg SW_APP_NAME=$APP_NAME \ + --build-arg SW_APP_NAME=$1 \ --build-arg SW_SKY_AOP=$SKY_AOP \ - -t $REGISTRY/tuoheng/$APP_NAME:$DOMAIN . # 注意末尾的 `.` 表示当前路径 -docker push $REGISTRY/tuoheng/$APP_NAME:$DOMAIN \ No newline at end of file + -t $2 . # 注意末尾的 `.` 表示当前路径 +docker push $2 \ No newline at end of file