refactor:修改生成镜像名字有unittest-tsg-diagnose为dign-client,badssl-tsg-diagnose为dign-server-web,dns-server-diagnose为dign-server-dns
This commit is contained in:
@@ -36,9 +36,9 @@ images_build:
|
||||
stage: prebuild
|
||||
extends: .build_docker_images
|
||||
variables:
|
||||
CLIENT_IMAGE_TAG: unittest-tsg-diagnose:latest
|
||||
SERVER_WEB_IMAGE_TAG: badssl-tsg-diagnose:latest
|
||||
SERVER_DNS_IMAGE_TAG: dns-server-diagnose:latest
|
||||
CLIENT_IMAGE_TAG: dign-client:latest
|
||||
SERVER_WEB_IMAGE_TAG: dign-server-web:latest
|
||||
SERVER_DNS_IMAGE_TAG: dign-server-dns:latest
|
||||
script:
|
||||
- mkdir -p images
|
||||
- docker build -t $CLIENT_IMAGE_TAG -f ./images_build/client/Dockerfile ./images_build/client/
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
if [ $1 == 2 ]; then
|
||||
systemctl stop tsg-diagnose
|
||||
docker rmi -f badssl-tsg-diagnose
|
||||
docker rmi -f unittest-tsg-diagnose
|
||||
docker rmi -f dns-server-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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
if [ $1 == 0 ]; then
|
||||
docker rmi -f badssl-tsg-diagnose
|
||||
docker rmi -f unittest-tsg-diagnose
|
||||
docker rmi -f dns-server-diagnose
|
||||
docker rmi -f dign-server-web
|
||||
docker rmi -f dign-client
|
||||
docker rmi -f dign-server-dns
|
||||
fi
|
||||
|
||||
@@ -3,7 +3,7 @@ version: '2.2'
|
||||
services:
|
||||
|
||||
badssl_server:
|
||||
image: "badssl-tsg-diagnose:latest"
|
||||
image: "dign-server-web:latest"
|
||||
container_name: "badssl_tsg-diagnose"
|
||||
tty: true
|
||||
privileged: true
|
||||
@@ -26,8 +26,8 @@ services:
|
||||
|
||||
|
||||
dns_server:
|
||||
image: "dns-server-diagnose:latest"
|
||||
container_name: "dns-server-diagnose"
|
||||
image: "dign-server-dns:latest"
|
||||
container_name: "dign-server-dns"
|
||||
tty: true
|
||||
privileged: true
|
||||
networks:
|
||||
@@ -49,7 +49,7 @@ services:
|
||||
tail -f /dev/null
|
||||
|
||||
unittest_client:
|
||||
image: "unittest-tsg-diagnose:latest"
|
||||
image: "dign-client:latest"
|
||||
container_name: "unittest_tsg-diagnose"
|
||||
depends_on:
|
||||
- badssl_server
|
||||
|
||||
Reference in New Issue
Block a user