From 5dc703f2765d99c3ff8ab4c26dd1783f2b505501 Mon Sep 17 00:00:00 2001 From: macro Date: Sat, 31 Oct 2020 16:27:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- document/sh/mall-admin.sh | 5 +++-- document/sh/{mall-config.sh => mall-auth.sh} | 7 ++++--- document/sh/mall-demo.sh | 15 --------------- document/sh/mall-gateway.sh | 4 +++- document/sh/mall-monitor.sh | 3 ++- document/sh/mall-portal.sh | 3 ++- document/sh/mall-registry.sh | 13 ------------- document/sh/mall-search.sh | 3 ++- 8 files changed, 16 insertions(+), 37 deletions(-) rename document/sh/{mall-config.sh => mall-auth.sh} (73%) delete mode 100644 document/sh/mall-demo.sh delete mode 100644 document/sh/mall-registry.sh diff --git a/document/sh/mall-admin.sh b/document/sh/mall-admin.sh index a0245d0..e8b0f23 100644 --- a/document/sh/mall-admin.sh +++ b/document/sh/mall-admin.sh @@ -6,9 +6,10 @@ docker rm ${app_name} echo '----rm container----' docker rmi `docker images | grep none | awk '{print $3}'` echo '----rm none images----' -docker run -p 8180:8180 --name ${app_name} \ +docker run -p 8080:8080 --name ${app_name} \ --link mysql:db \ ---link mall-registry:mall-registry \ +--link nacos-registry:nacos-registry \ +-e TZ="Asia/Shanghai" \ -v /etc/localtime:/etc/localtime \ -v /mydata/app/${app_name}/logs:/var/logs \ -d mall/${app_name}:1.0-SNAPSHOT diff --git a/document/sh/mall-config.sh b/document/sh/mall-auth.sh similarity index 73% rename from document/sh/mall-config.sh rename to document/sh/mall-auth.sh index 83c7163..e64d80b 100644 --- a/document/sh/mall-config.sh +++ b/document/sh/mall-auth.sh @@ -1,13 +1,14 @@ #!/usr/bin/env bash -app_name='mall-config' +app_name='mall-auth' docker stop ${app_name} echo '----stop container----' docker rm ${app_name} echo '----rm container----' docker rmi `docker images | grep none | awk '{print $3}'` echo '----rm none images----' -docker run -p 8301:8301 --name ${app_name} \ ---link mall-registry:mall-registry \ +docker run -p 8401:8401 --name ${app_name} \ +--link nacos-registry:nacos-registry \ +-e TZ="Asia/Shanghai" \ -v /etc/localtime:/etc/localtime \ -v /mydata/app/${app_name}/logs:/var/logs \ -d mall/${app_name}:1.0-SNAPSHOT diff --git a/document/sh/mall-demo.sh b/document/sh/mall-demo.sh deleted file mode 100644 index c9bf98d..0000000 --- a/document/sh/mall-demo.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -app_name='mall-demo' -docker stop ${app_name} -echo '----stop container----' -docker rm ${app_name} -echo '----rm container----' -docker rmi `docker images | grep none | awk '{print $3}'` -echo '----rm none images----' -docker run -p 8082:8082 --name ${app_name} \ ---link mysql:db \ ---link mall-registry:mall-registry \ --v /etc/localtime:/etc/localtime \ --v /mydata/app/${app_name}/logs:/var/logs \ --d mall/${app_name}:1.0-SNAPSHOT -echo '----start container----' \ No newline at end of file diff --git a/document/sh/mall-gateway.sh b/document/sh/mall-gateway.sh index 8b346c4..5cef285 100644 --- a/document/sh/mall-gateway.sh +++ b/document/sh/mall-gateway.sh @@ -7,7 +7,9 @@ echo '----rm container----' docker rmi `docker images | grep none | awk '{print $3}'` echo '----rm none images----' docker run -p 8201:8201 --name ${app_name} \ ---link mall-registry:mall-registry \ +--link redis:redis \ +--link nacos-registry:nacos-registry \ +-e TZ="Asia/Shanghai" \ -v /etc/localtime:/etc/localtime \ -v /mydata/app/${app_name}/logs:/var/logs \ -d mall/${app_name}:1.0-SNAPSHOT diff --git a/document/sh/mall-monitor.sh b/document/sh/mall-monitor.sh index bd21597..97f71c9 100644 --- a/document/sh/mall-monitor.sh +++ b/document/sh/mall-monitor.sh @@ -7,7 +7,8 @@ echo '----rm container----' docker rmi `docker images | grep none | awk '{print $3}'` echo '----rm none images----' docker run -p 8101:8101 --name ${app_name} \ ---link mall-registry:mall-registry \ +--link nacos-registry:nacos-registry \ +-e TZ="Asia/Shanghai" \ -v /etc/localtime:/etc/localtime \ -v /mydata/app/${app_name}/logs:/var/logs \ -d mall/${app_name}:1.0-SNAPSHOT diff --git a/document/sh/mall-portal.sh b/document/sh/mall-portal.sh index 6f88e77..a2dd347 100644 --- a/document/sh/mall-portal.sh +++ b/document/sh/mall-portal.sh @@ -11,7 +11,8 @@ docker run -p 8085:8085 --name ${app_name} \ --link redis:redis \ --link mongo:mongo \ --link rabbitmq:rabbit \ ---link mall-registry:mall-registry \ +--link nacos-registry:nacos-registry \ +-e TZ="Asia/Shanghai" \ -v /etc/localtime:/etc/localtime \ -v /mydata/app/${app_name}/logs:/var/logs \ -d mall/${app_name}:1.0-SNAPSHOT diff --git a/document/sh/mall-registry.sh b/document/sh/mall-registry.sh deleted file mode 100644 index 2d41f2c..0000000 --- a/document/sh/mall-registry.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -app_name='mall-registry' -docker stop ${app_name} -echo '----stop container----' -docker rm ${app_name} -echo '----rm container----' -docker rmi `docker images | grep none | awk '{print $3}'` -echo '----rm none images----' -docker run -p 8001:8001 --name ${app_name} \ --v /etc/localtime:/etc/localtime \ --v /mydata/app/${app_name}/logs:/var/logs \ --d mall/${app_name}:1.0-SNAPSHOT -echo '----start container----' \ No newline at end of file diff --git a/document/sh/mall-search.sh b/document/sh/mall-search.sh index 4957199..2c27379 100644 --- a/document/sh/mall-search.sh +++ b/document/sh/mall-search.sh @@ -9,7 +9,8 @@ echo '----rm none images----' docker run -p 8081:8081 --name ${app_name} \ --link mysql:db \ --link elasticsearch:es \ ---link mall-registry:mall-registry \ +--link nacos-registry:nacos-registry \ +-e TZ="Asia/Shanghai" \ -v /etc/localtime:/etc/localtime \ -v /mydata/app/${app_name}/logs:/var/logs \ -d mall/${app_name}:1.0-SNAPSHOT