Skip to content

Y
yichengstreet-be
Commit d865b37b authored by zhoubin's avatar zhoubin
Browse files
Options

Merge branch 'dev' into 'main' 

迁移卓易云

See merge request !92
parents 67c0f5d2 1c30386c
Pipeline #143048 passed with stages
      in 7 minutes and 14 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 2 additions and 2 deletions
      .gitlab-ci.yml
      View file @ d865b37b
      ...@@ -3,7 +3,7 @@ variables: ...@@ -3,7 +3,7 @@ variables:
      MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true -Dmaven.test.skip=true" MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true -Dmaven.test.skip=true"
      USERNAME: yx-street #hub.eazytec-cloud.com用户名 USERNAME: yx-street #hub.eazytec-cloud.com用户名
      TOKEN: xUSFbdB95yVRr #hub.eazytec-cloud.com的CLI密码 TOKEN: xUSFbdB95yVRr #hub.eazytec-cloud.com的CLI密码
      REPO: harbor.eazytec-building.com #hub.eazytec-cloud.com的地址 REPO: 47.103.57.78:30002 #hub.eazytec-cloud.com的地址
      NAMESPACE: yx-street #项目名 NAMESPACE: yx-street #项目名
      IMAGE: yichengstreet-be #项目英文名 IMAGE: yichengstreet-be #项目英文名
      OKD: osr.eazytec.intra:8443 #pass平台的地址 OKD: osr.eazytec.intra:8443 #pass平台的地址
      ...@@ -39,7 +39,7 @@ deploy: ...@@ -39,7 +39,7 @@ deploy:
      image: hub.eazytec-cloud.com/devops/docker:18 image: hub.eazytec-cloud.com/devops/docker:18
      services: services:
      - name: hub.eazytec-cloud.com/devops/docker:18-dind - name: hub.eazytec-cloud.com/devops/docker:18-dind
      command: ["--insecure-registry=https://docker-registry-default.app.eazytec.intra", "--registry-mirror=http://bdex97.eazytec.intra:5000"] command: ["--insecure-registry=47.103.57.78:30002", "--registry-mirror=http://bdex97.eazytec.intra:5000"]
      alias: docker alias: docker
      before_script: before_script:
      - docker info - docker info
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment