Browse Source

update build.sh

reghao 3 months ago
parent
commit
5d5b2d243e
2 changed files with 18 additions and 19 deletions
  1. 10 10
      build.sh
  2. 8 9
      docker_app.sh

+ 10 - 10
build.sh

@@ -96,37 +96,37 @@ build_front() {
 ###############################################################################
 build_image() {
   cd ${proj_dir}/tnb
-  commit_id=`git rev-parse HEAD | cut -c 1-8`
+#   commit_id=`git rev-parse HEAD | cut -c 1-8`
   docker_prefix='tnb'
 
   cd ${proj_dir}/tnb/eureka/eureka-server
-  docker build -t ${docker_prefix}/eureka:${commit_id} .
+  docker build -t ${docker_prefix}/eureka .
 
   cd ${proj_dir}/tnb/gateway/
-  docker build -t ${docker_prefix}/gateway:${commit_id} .
+  docker build -t ${docker_prefix}/gateway .
   
   cd ${proj_dir}/tnb/account/account-service/
-  docker build -t ${docker_prefix}/account:${commit_id} .
+  docker build -t ${docker_prefix}/account .
 
   cd ${proj_dir}/tnb/message/message-service/
-  docker build -t ${docker_prefix}/message:${commit_id} .
+  docker build -t ${docker_prefix}/message .
 
   cd ${proj_dir}/tnb/file/file-service
-  docker build -t ${docker_prefix}/file:${commit_id} .
+  docker build -t ${docker_prefix}/file .
 
   cd ${proj_dir}/tnb/user/user-service/
-  docker build -t ${docker_prefix}/user:${commit_id} .
+  docker build -t ${docker_prefix}/user .
   
   cd ${proj_dir}/tnb/content/content-service/
-  docker build -t ${docker_prefix}/content:${commit_id} .
+  docker build -t ${docker_prefix}/content .
   
   cd ${proj_dir}/tnb/search/search-service/
-  docker build -t ${docker_prefix}/search:${commit_id} .
+  docker build -t ${docker_prefix}/search .
 
   cd ${proj_dir}/tnbapp
   commit_id=`git rev-parse HEAD | cut -c 1-8`
   docker_prefix='tnb'
-  docker build -t ${docker_prefix}/tnbapp:${commit_id} .
+  docker build -t ${docker_prefix}/tnbapp .
 }
 
 echo "创建 proj 目录和 bin 目录..."

+ 8 - 9
docker_app.sh

@@ -7,15 +7,14 @@
 set -e
 
 function start() {
-  commit_id=`git rev-parse HEAD | cut -c 1-8`
-  docker run -d --name=tnbeureka --network=host -v /opt/log:/app/logs tnb/eureka:${commit_id}
-  docker run -d --name=tnbgateway --network=host -v /opt/log:/app/logs tnb/gateway:${commit_id}
-  docker run -d --name=tnbaccount --network=host -v /opt/log:/app/logs tnb/account:${commit_id}
-  docker run -d --name=tnbmessage --network=host -v /opt/log:/app/logs tnb/message:${commit_id}
-  docker run -d --name=tnbfile --network=host -v /opt/log:/app/logs tnb/file:${commit_id}
-  docker run -d --name=tnbuser --network=host -v /opt/log:/app/logs tnb/user:${commit_id}
-  docker run -d --name=tnbcontent --network=host -v /opt/log:/app/logs tnb/content:${commit_id}
-  docker run -d --name=tnbsearch --network=host -v /opt/log:/app/logs tnb/search:${commit_id}
+  docker run -d --name=tnbeureka --network=host -v /opt/log:/app/logs tnb/eureka
+  docker run -d --name=tnbgateway --network=host -v /opt/log:/app/logs tnb/gateway
+  docker run -d --name=tnbaccount --network=host -v /opt/log:/app/logs tnb/account
+  docker run -d --name=tnbmessage --network=host -v /opt/log:/app/logs tnb/message
+  docker run -d --name=tnbfile --network=host -v /opt/log:/app/logs tnb/file
+  docker run -d --name=tnbuser --network=host -v /opt/log:/app/logs tnb/user
+  docker run -d --name=tnbcontent --network=host -v /opt/log:/app/logs tnb/content
+  docker run -d --name=tnbsearch --network=host -v /opt/log:/app/logs tnb/search
 }
 
 function shutdown() {