diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd646bb..0505e02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,11 +50,11 @@ images_build: - mkdir -p images - rm -rf images/* - docker build -t $CLIENT_IMAGE_TAG -f ./images_build/client/Dockerfile ./images_build/client/ - - docker save $CLIENT_IMAGE_TAG > images/client.tar + - docker save $CLIENT_IMAGE_TAG > images/tsg_diagnose_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 save $SERVER_WEB_IMAGE_TAG > images/tsg_diagnose_server_web.tar - docker build -t $SERVER_DNS_IMAGE_TAG -f ./images_build/server_dns/Dockerfile ./images_build/server_dns/ - - docker save $SERVER_DNS_IMAGE_TAG > images/server_dns.tar + - docker save $SERVER_DNS_IMAGE_TAG > images/tsg_diagnose_server_dns.tar feature_branch_build_centos7: diff --git a/README.md b/README.md index 1ec4cc7..ce92619 100644 --- a/README.md +++ b/README.md @@ -12,17 +12,17 @@ dnf install tsg-diagnose ### Docker If you have installed TSG Diagnose with Docker support, you can use the following command to build the TSG Diagnose runtime environment. ```bash -docker load < /opt/tsg/tsg-diagnose/images/server_web.tar -docker load < /opt/tsg/tsg-diagnose/images/server_dns.tar -docker load < /opt/tsg/tsg-diagnose/images/client.tar +docker load < /opt/tsg/tsg-diagnose/images/tsg_diagnose_server_web.tar +docker load < /opt/tsg/tsg-diagnose/images/tsg_diagnose_server_dns.tar +docker load < /opt/tsg/tsg-diagnose/images/tsg_diagnose_client.tar docker-compose down --remove-orphans; docker-compose up -d --remove-orphans ``` ### k3s If you have installed TSG Diagnose with k3s support, you can use the following command to build the TSG Diagnose runtime environment. ```bash -k3s ctr image import /opt/tsg/tsg-diagnose/images/server_web.tar -k3s ctr image import /opt/tsg/tsg-diagnose/images/server_dns.tar -k3s ctr image import /opt/tsg/tsg-diagnose/images/client.tar +k3s ctr image import /opt/tsg/tsg-diagnose/images/tsg_diagnose_server_web.tar +k3s ctr image import /opt/tsg/tsg-diagnose/images/tsg_diagnose_server_dns.tar +k3s ctr image import /opt/tsg/tsg-diagnose/images/tsg_diagnose_client.tar kubectl apply -f /opt/tsg/tsg-diagnose/k8s-resource/tsg-diagnose-client.yaml kubectl apply -f /opt/tsg/tsg-diagnose/k8s-resource/tsg-diagnose-server.yaml ``` diff --git a/cmake/Package.cmake b/cmake/Package.cmake index c30cb9a..c83742c 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -17,10 +17,6 @@ set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") set(CPACK_RPM_PACKAGE_RELEASE_DIST on) set(CPACK_RPM_DEBUGINFO_PACKAGE on) -set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in) -set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreunInstall.in) -set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostunInstall.in) - install(FILES compose/docker-compose.yml DESTINATION ./compose) install(FILES k8s-resource/tsg-diagnose-client.yaml DESTINATION ./k8s-resource) install(FILES k8s-resource/tsg-diagnose-server.yaml DESTINATION ./k8s-resource) diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in deleted file mode 100644 index 7a484d7..0000000 --- a/cmake/PostInstall.in +++ /dev/null @@ -1,13 +0,0 @@ -if [ $1 == 2 ]; then - systemctl stop tsg-diagnose - docker rmi -f dign-server-web - docker rmi -f dign-client - docker rmi -f dign-server-dns -fi -docker load < /opt/tsg/tsg-diagnose/images/server_web.tar -docker load < /opt/tsg/tsg-diagnose/images/client.tar -docker load < /opt/tsg/tsg-diagnose/images/server_dns.tar -chmod 0755 /opt/tsg/tsg-diagnose/etc/.certs_import/certs/tool -chmod 0755 /opt/tsg/tsg-diagnose/scripts/tsg-diagnose-oneshot -chmod 0755 /opt/tsg/tsg-diagnose/scripts/tsg-diagnose-periodical -chmod 0755 /etc/profile.d/tsg-diagnose.sh diff --git a/cmake/PostunInstall.in b/cmake/PostunInstall.in deleted file mode 100644 index 1605557..0000000 --- a/cmake/PostunInstall.in +++ /dev/null @@ -1,5 +0,0 @@ -if [ $1 == 0 ]; then - docker rmi -f dign-server-web - docker rmi -f dign-client - docker rmi -f dign-server-dns -fi diff --git a/cmake/PreunInstall.in b/cmake/PreunInstall.in deleted file mode 100644 index 18a38a6..0000000 --- a/cmake/PreunInstall.in +++ /dev/null @@ -1,3 +0,0 @@ -if [ $1 == 0 ]; then - systemctl stop tsg-diagnose -fi \ No newline at end of file diff --git a/service/tsg-diagnose.service b/service/tsg-diagnose.service index 00cf4e2..2ecde57 100644 --- a/service/tsg-diagnose.service +++ b/service/tsg-diagnose.service @@ -7,9 +7,9 @@ After=docker.service Type=oneshot RemainAfterExit=yes WorkingDirectory=/opt/tsg/tsg-diagnose/compose/%i -ExecStartPre=/bin/sh -c "docker load < /opt/tsg/tsg-diagnose/images/server_web.tar" -ExecStartPre=/bin/sh -c "docker load < /opt/tsg/tsg-diagnose/images/server_dns.tar" -ExecStartPre=/bin/sh -c "docker load < /opt/tsg/tsg-diagnose/images/client.tar" +ExecStartPre=/bin/sh -c "docker load < /opt/tsg/tsg-diagnose/images/tsg_diagnose_server_web.tar" +ExecStartPre=/bin/sh -c "docker load < /opt/tsg/tsg-diagnose/images/tsg_diagnose_server_dns.tar" +ExecStartPre=/bin/sh -c "docker load < /opt/tsg/tsg-diagnose/images/tsg_diagnose_client.tar" ExecStart=/bin/sh -c "docker-compose down --remove-orphans; docker-compose up -d --remove-orphans" ExecStop=/bin/sh -c "docker-compose down --remove-orphans"