From b29fdf0b29082d397b7f70d7ec87885ae1a9890b Mon Sep 17 00:00:00 2001 From: gaochengrui Date: Tue, 23 Jun 2020 09:58:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=B0=E4=B8=A4=E5=8F=B0?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 9 ++++++--- docker/api/docker-compose.yml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15e2a43..d45e900 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,8 @@ api: #随意填写,起标示作用 only: - deploy #指定触发分支 + tags: + - "155auto" script: - pwd @@ -21,7 +23,8 @@ cli: #随意填写,起标示作用 only: - deploy #指定触发分支 - + tags: + - "155auto" script: - pwd @@ -37,7 +40,7 @@ cli: #随意填写,起标示作用 only: - deploy #指定触发分支 tags: - - "156aoto" + - "156auto" script: - pwd - docker stop auto-custom-clibrary-api || true && docker rm auto-custom-clibrary-api || true @@ -52,7 +55,7 @@ cli: #随意填写,起标示作用 only: - deploy #指定触发分支 tags: - - "156aoto" + - "156auto" script: - pwd - docker stop auto-custom-clibrary-cli || true && docker rm auto-custom-clibrary-cli || true diff --git a/docker/api/docker-compose.yml b/docker/api/docker-compose.yml index ea25a78..40f6980 100644 --- a/docker/api/docker-compose.yml +++ b/docker/api/docker-compose.yml @@ -7,7 +7,7 @@ services: environment: TZ: Asia/Shanghai working_dir: /usr/src/python - command: robot -i tsg_bf_api -d $time/ autotsg + command: robot -i tsg_bf_api -d api/$time/ autotsg privileged: true volumes: - /home/autotsg-gao:/usr/src/python