gfwleak/tsg-tsg-diagnose
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Modify image tar file name in rpm package.

Browse Source
This commit is contained in:
fumingwei
2024-06-13 11:55:45 +08:00
parent 8b70f1f19c
commit 4d60028147
7 changed files with 12 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@@ -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:

12
README.md
View File

@@ -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
```

4
cmake/Package.cmake
View File

@@ -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)

13
cmake/PostInstall.in
View File

@@ -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

5
cmake/PostunInstall.in
View File

@@ -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

3
cmake/PreunInstall.in
View File

@@ -1,3 +0,0 @@
if [ $1 == 0 ]; then
systemctl stop tsg-diagnose
fi

6
service/tsg-diagnose.service
View File

@@ -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"