From 69f1574b002985378d6fbcfb53191d4c75b7fee3 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Wed, 1 Sep 2021 16:27:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E5=B0=86dnsmasq=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0images=5Fbuild=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- cmake/Package.cmake | 2 +- {dnsmasq => images_build/dnsmasq}/Dockerfile | 0 {dnsmasq => images_build/dnsmasq}/README.md | 0 {dnsmasq => images_build/dnsmasq}/config/dnsmasq.conf | 0 {dnsmasq => images_build/dnsmasq}/dnsmasq.conf | 0 6 files changed, 2 insertions(+), 2 deletions(-) rename {dnsmasq => images_build/dnsmasq}/Dockerfile (100%) rename {dnsmasq => images_build/dnsmasq}/README.md (100%) rename {dnsmasq => images_build/dnsmasq}/config/dnsmasq.conf (100%) rename {dnsmasq => images_build/dnsmasq}/dnsmasq.conf (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8fc5ce4..b8f7f9f 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 5024537..db98a49 100644 --- a/cmake/Package.cmake +++ b/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) diff --git a/dnsmasq/Dockerfile b/images_build/dnsmasq/Dockerfile similarity index 100% rename from dnsmasq/Dockerfile rename to images_build/dnsmasq/Dockerfile diff --git a/dnsmasq/README.md b/images_build/dnsmasq/README.md similarity index 100% rename from dnsmasq/README.md rename to images_build/dnsmasq/README.md diff --git a/dnsmasq/config/dnsmasq.conf b/images_build/dnsmasq/config/dnsmasq.conf similarity index 100% rename from dnsmasq/config/dnsmasq.conf rename to images_build/dnsmasq/config/dnsmasq.conf diff --git a/dnsmasq/dnsmasq.conf b/images_build/dnsmasq/dnsmasq.conf similarity index 100% rename from dnsmasq/dnsmasq.conf rename to images_build/dnsmasq/dnsmasq.conf