refactor:修改unittest_python的目录名字为client

This commit is contained in:
fumingwei
2021-09-01 16:57:28 +08:00
parent d98faf54b3
commit 94c93bf498
10 changed files with 5 additions and 5 deletions

View File

@@ -36,13 +36,13 @@ images_build:
stage: prebuild
extends: .build_docker_images
variables:
UNITTEST_IMAGE_TAG: unittest-tsg-diagnose:latest
CLIENT_IMAGE_TAG: unittest-tsg-diagnose:latest
SERVER_WEB_IMAGE_TAG: badssl-tsg-diagnose:latest
DNS_IMAGES_TAGE: dns-server-diagnose:latest
script:
- mkdir -p images
- docker build -t $UNITTEST_IMAGE_TAG -f ./images_build/unittest_python/Dockerfile ./images_build/unittest_python/
- docker save $UNITTEST_IMAGE_TAG > images/unittest.tar
- docker build -t $CLIENT_IMAGE_TAG -f ./images_build/client/Dockerfile ./images_build/client/
- docker save $CLIENT_IMAGE_TAG > images/client.tar
- docker build -t $SERVER_WEB_IMAGE_TAG -f ./images_build/server_web/Dockerfile ./images_build/server_web/
- docker save $SERVER_WEB_IMAGE_TAG > images/server_web.tar
- docker build -t $DNS_IMAGES_TAGE -f ./images_build/dnsmasq/Dockerfile ./images_build/dnsmasq

View File

@@ -22,7 +22,7 @@ set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreunInstall.i
set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostunInstall.in)
install(FILES compose/docker-compose.yml DESTINATION ./compose)
install(FILES images_build/unittest_python/unittest/etc/tsg-diagnose.config DESTINATION ./etc)
install(FILES images_build/client/unittest/etc/tsg-diagnose.config DESTINATION ./etc)
install(FILES service/tsg-diagnose.service DESTINATION /usr/lib/systemd/system)
install(FILES images_build/dnsmasq/config/dnsmasq.conf DESTINATION /opt/tsg/tsg-diagnose/etc/)
install(DIRECTORY images/ DESTINATION ./images)

View File

@@ -5,5 +5,5 @@ if [ $1 == 2 ]; then
docker rmi -f dns-server-diagnose
fi
docker load < /opt/tsg/tsg-diagnose/images/server_web.tar
docker load < /opt/tsg/tsg-diagnose/images/unittest.tar
docker load < /opt/tsg/tsg-diagnose/images/client.tar
docker load < /opt/tsg/tsg-diagnose/images/dns.tar