Skip to content

A
apaas-ui
Commit b0c415c4 authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

Merge branch 'pure' into dev

parents 56a7c2c2 e310d1e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 416 deletions
.beagle.yml
View file @ b0c415c4
...@@ -17,7 +17,7 @@ pipeline: ...@@ -17,7 +17,7 @@ pipeline:
- /data/cache:/cache - /data/cache:/cache
when: when:
branch: branch:
- dev - pure
## 构建 ## 构建
build: build:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-node:12.18.0-stretch image: registry.cn-qingdao.aliyuncs.com/wod/devops-node:12.18.0-stretch
...@@ -29,7 +29,7 @@ pipeline: ...@@ -29,7 +29,7 @@ pipeline:
- yarn build - yarn build
when: when:
branch: branch:
- dev - pure
store-cache: store-cache:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0 image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0
...@@ -40,7 +40,7 @@ pipeline: ...@@ -40,7 +40,7 @@ pipeline:
- /data/cache:/cache - /data/cache:/cache
when: when:
branch: branch:
- dev - pure
## 编译成静态文件 ## 编译成静态文件
docker: docker:
...@@ -51,7 +51,7 @@ pipeline: ...@@ -51,7 +51,7 @@ pipeline:
dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
repo: wod/apaas-ui repo: wod/apaas-ui
version: v3.0.2 version: v3.0.2
channel: alpha channel: pure
args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数 args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数
registry: registry.cn-qingdao.aliyuncs.com registry: registry.cn-qingdao.aliyuncs.com
secrets: secrets:
...@@ -61,43 +61,7 @@ pipeline: ...@@ -61,43 +61,7 @@ pipeline:
target: REGISTRY_PASSWORD target: REGISTRY_PASSWORD
when: when:
branch: branch:
- dev - pure
## 更换dev生成镜像的名称
harbor:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
# 生成最终amd版本
latest:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
# 构建arm64位镜像 # 构建arm64位镜像
docker-arm64: docker-arm64:
...@@ -108,7 +72,7 @@ pipeline: ...@@ -108,7 +72,7 @@ pipeline:
dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
repo: wod/apaas-ui repo: wod/apaas-ui
version: v3.0.2 version: v3.0.2
channel: alpha-arm64 channel: pure-arm64
args: "TARGETOS=linux,TARGETARCH=arm64" args: "TARGETOS=linux,TARGETARCH=arm64"
registry: registry.cn-qingdao.aliyuncs.com registry: registry.cn-qingdao.aliyuncs.com
secrets: secrets:
...@@ -118,44 +82,8 @@ pipeline: ...@@ -118,44 +82,8 @@ pipeline:
target: REGISTRY_PASSWORD target: REGISTRY_PASSWORD
when: when:
branch: branch:
- dev - pure
## 更换dev生成arm64镜像的名称
harbor-arm64:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-arm64
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
# 生成最终arm版本
latest-arm64:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-arm64
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
docker-ppc64le: docker-ppc64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes: volumes:
...@@ -164,7 +92,7 @@ pipeline: ...@@ -164,7 +92,7 @@ pipeline:
dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
repo: wod/apaas-ui repo: wod/apaas-ui
version: v3.0.2 version: v3.0.2
channel: alpha-ppc64le channel: pure-ppc64le
args: "TARGETOS=linux,TARGETARCH=ppc64le" args: "TARGETOS=linux,TARGETARCH=ppc64le"
registry: registry.cn-qingdao.aliyuncs.com registry: registry.cn-qingdao.aliyuncs.com
secrets: secrets:
...@@ -174,41 +102,7 @@ pipeline: ...@@ -174,41 +102,7 @@ pipeline:
target: REGISTRY_PASSWORD target: REGISTRY_PASSWORD
when: when:
branch: branch:
- dev - pure
harbor-ppc64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
latest-ppc64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
docker-mips64le: docker-mips64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
...@@ -218,7 +112,7 @@ pipeline: ...@@ -218,7 +112,7 @@ pipeline:
dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
repo: wod/apaas-ui repo: wod/apaas-ui
version: v3.0.2 version: v3.0.2
channel: alpha-mips64le channel: pure-mips64le
args: "TARGETOS=linux,TARGETARCH=mips64le" args: "TARGETOS=linux,TARGETARCH=mips64le"
registry: registry.cn-qingdao.aliyuncs.com registry: registry.cn-qingdao.aliyuncs.com
secrets: secrets:
...@@ -228,48 +122,4 @@ pipeline: ...@@ -228,48 +122,4 @@ pipeline:
target: REGISTRY_PASSWORD target: REGISTRY_PASSWORD
when: when:
branch: branch:
- dev - pure
harbor-mips64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-mips64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
latest-mips64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-mips64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
deploy:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0
namespace: apaas-v3
deployment: apaas-ui
container: apaas-ui
registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha
when:
branch:
- dev
config/index.js
View file @ b0c415c4
...@@ -11,21 +11,21 @@ module.exports = { ...@@ -11,21 +11,21 @@ module.exports = {
assetsPublicPath: "/apaas/ui/", assetsPublicPath: "/apaas/ui/",
proxyTable: { proxyTable: {
"/apaas": { "/apaas": {
target: "https://apaas3.wodcloud.com/apaas/", target: "https://apaas.test.wodcloud.com/apaas/",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/apaas": "" "^/apaas": ""
} }
}, },
"/awecloud": { "/awecloud": {
target: "https://apaas3.wodcloud.com/awecloud/", target: "https://apaas.test.wodcloud.com/awecloud/",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/awecloud": "" "^/awecloud": ""
} }
}, },
"/vmap": { "/vmap": {
target: "https://apaas3.wodcloud.com/vmap/", target: "https://apaas.test.wodcloud.com/vmap/",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/vmap": "" "^/vmap": ""
......
src/pages/workbench/fwzc_fwcs.vue
View file @ b0c415c4
This diff is collapsed.
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