refactor:将dnsmasq目录移动到images_build目录下

.gitlab-ci.yml

@@ -45,7 +45,7 @@ images_build:
     - docker save $UNITTEST_IMAGE_TAG > images/unittest.tar
     - docker build -t $BADSSL_IMAGE_TAG -f ./images_build/badssl.com/Dockerfile ./images_build/badssl.com/
     - docker save $BADSSL_IMAGE_TAG  > images/badssl.tar
-    - docker build -t $DNS_IMAGES_TAGE -f ./dnsmasq/Dockerfile ./dnsmasq
+    - docker build -t $DNS_IMAGES_TAGE -f ./images_build/dnsmasq/Dockerfile ./images_build/dnsmasq
     - docker save $DNS_IMAGES_TAGE > images/dns.tar
 
 

cmake/Package.cmake

@@ -24,7 +24,7 @@ set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostunInstall
 install(FILES compose/docker-compose.yml DESTINATION ./compose)
 install(FILES images_build/unittest_python/unittest/etc/tsg-diagnose.config DESTINATION ./etc)
 install(FILES service/tsg-diagnose.service DESTINATION /usr/lib/systemd/system)
-install(FILES 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)
 
 include(CPack)