diff --git a/others/dev/build_test_env.sh b/others/dev/build_test_env.sh index 7ec7486d..4bb8da70 100755 --- a/others/dev/build_test_env.sh +++ b/others/dev/build_test_env.sh @@ -3,6 +3,8 @@ echo "================== 关闭全部服务 ==================" docker-compose down +echo "================== 删除历史数据 ==================" +rm -rf ~/powerjob-data/ echo "================== 构建 jar ==================" cd `dirname $0`/../.. || exit # mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am diff --git a/others/dev/docker-compose.yml b/others/dev/docker-compose.yml index 2d992d2f..db48b030 100644 --- a/others/dev/docker-compose.yml +++ b/others/dev/docker-compose.yml @@ -40,10 +40,6 @@ services: powerjob-server: build: context: ../../powerjob-server/docker - deploy: - resources: - limits: - memory: 1536M container_name: powerjob-server image: powerjob/powerjob-server:test_env restart: always @@ -64,10 +60,6 @@ services: powerjob-worker-agent: build: context: ../../powerjob-worker-agent - deploy: - resources: - limits: - memory: 512M container_name: powerjob-worker-agent image: powerjob/powerjob-worker-agent:test_env restart: always @@ -86,10 +78,6 @@ services: - "./wait-for-it.sh powerjob-server:7700 --strict -- java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=10000 -Dcom.sun.management.jmxremote.rmi.port=10000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -server -XX:+UseG1GC -Xms256m -Xmx256m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=7 -XX:GCLogFileSize=100M -Xloggc:/root/gc.log -jar /powerjob-agent.jar --app powerjob-worker-samples --server powerjob-server:7700" powerjob-worker-agent2: - deploy: - resources: - limits: - memory: 512M container_name: powerjob-worker-agent2 image: powerjob/powerjob-worker-agent:test_env restart: always