refactor:修改unittest_python的目录名字为client
This commit is contained in:
@@ -36,13 +36,13 @@ images_build:
|
|||||||
stage: prebuild
|
stage: prebuild
|
||||||
extends: .build_docker_images
|
extends: .build_docker_images
|
||||||
variables:
|
variables:
|
||||||
UNITTEST_IMAGE_TAG: unittest-tsg-diagnose:latest
|
CLIENT_IMAGE_TAG: unittest-tsg-diagnose:latest
|
||||||
SERVER_WEB_IMAGE_TAG: badssl-tsg-diagnose:latest
|
SERVER_WEB_IMAGE_TAG: badssl-tsg-diagnose:latest
|
||||||
DNS_IMAGES_TAGE: dns-server-diagnose:latest
|
DNS_IMAGES_TAGE: dns-server-diagnose:latest
|
||||||
script:
|
script:
|
||||||
- mkdir -p images
|
- mkdir -p images
|
||||||
- docker build -t $UNITTEST_IMAGE_TAG -f ./images_build/unittest_python/Dockerfile ./images_build/unittest_python/
|
- docker build -t $CLIENT_IMAGE_TAG -f ./images_build/client/Dockerfile ./images_build/client/
|
||||||
- docker save $UNITTEST_IMAGE_TAG > images/unittest.tar
|
- 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 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 save $SERVER_WEB_IMAGE_TAG > images/server_web.tar
|
||||||
- docker build -t $DNS_IMAGES_TAGE -f ./images_build/dnsmasq/Dockerfile ./images_build/dnsmasq
|
- docker build -t $DNS_IMAGES_TAGE -f ./images_build/dnsmasq/Dockerfile ./images_build/dnsmasq
|
||||||
|
|||||||
@@ -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)
|
set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostunInstall.in)
|
||||||
|
|
||||||
install(FILES compose/docker-compose.yml DESTINATION ./compose)
|
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 service/tsg-diagnose.service DESTINATION /usr/lib/systemd/system)
|
||||||
install(FILES images_build/dnsmasq/config/dnsmasq.conf DESTINATION /opt/tsg/tsg-diagnose/etc/)
|
install(FILES images_build/dnsmasq/config/dnsmasq.conf DESTINATION /opt/tsg/tsg-diagnose/etc/)
|
||||||
install(DIRECTORY images/ DESTINATION ./images)
|
install(DIRECTORY images/ DESTINATION ./images)
|
||||||
|
|||||||
@@ -5,5 +5,5 @@ if [ $1 == 2 ]; then
|
|||||||
docker rmi -f dns-server-diagnose
|
docker rmi -f dns-server-diagnose
|
||||||
fi
|
fi
|
||||||
docker load < /opt/tsg/tsg-diagnose/images/server_web.tar
|
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
|
docker load < /opt/tsg/tsg-diagnose/images/dns.tar
|
||||||
|
|||||||
Reference in New Issue
Block a user