diff --git a/.beagle-arm.yml b/.beagle-arm.yml deleted file mode 100644 index 075921280edbfd20e478d9014a125ba019647697..0000000000000000000000000000000000000000 --- a/.beagle-arm.yml +++ /dev/null @@ -1,77 +0,0 @@ - -clone: - git: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-git-arm64:1.0 -pipeline: - read-cache: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache-arm64:1.0 - restore: true - check: yarn.lock - mount: - - ./node_modules - - ./yarn.lock - volumes: - - /data/cache:/cache - build: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-node-arm64:12.18.2-buster - volumes: - - /data/cache/yarn:/usr/local/share/.cache/yarn - commands: - - yarn install - - yarn run build - store-cache: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache-arm64:1.0 - rebuild: true - mount: - - ./node_modules - - ./yarn.lock - volumes: - - /data/cache:/cache - docker: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base-arm64:2.0 - repo: wod/apaas-ui-arm64 - version: "v3.0.0" - channel: alpha - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: dev - harbor: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base-arm64:2.0 - repo: wod/apaas-ui-arm64 - version: "v3.0.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 - latest: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base-arm64:2.0 - repo: wod/apaas-ui-arm64 - version: "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 - -branches: [master,dev] diff --git a/.beagle.yml b/.beagle.yml index e91c23152c99423c477ced0f5aa4c59bbc599fbc..29d87178664f3c830887b1c32aa3e21eaa286984 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -1,43 +1,49 @@ -platform: 10.11.92.33 +platform: 10.11.92.34 + clone: git: image: registry.cn-qingdao.aliyuncs.com/wod/devops-git:1.0 pull: true dns: 223.5.5.5 + pipeline: + ## 读缓存 read-cache: image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0 restore: true - check: yarn.lock mount: - ./node_modules - - ./yarn.lock volumes: - /data/cache:/cache + ## 构建 build: image: registry.cn-qingdao.aliyuncs.com/wod/devops-node:12.18.0-stretch dns: 223.5.5.5 volumes: - /data/cache/yarn:/usr/local/share/.cache/yarn commands: - - yarn install - - yarn run build + - yarn + - yarn build + store-cache: image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0 rebuild: true mount: - ./node_modules - - ./yarn.lock volumes: - /data/cache:/cache + + ## 编译成静态文件 docker: image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0 + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0 + dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: "v3.0.2" + version: v3.0.2 channel: alpha + args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数 registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -45,14 +51,56 @@ pipeline: - source: REGISTRY_PASSWORD_ALIYUN target: REGISTRY_PASSWORD when: - branch: dev + branch: + - dev + + ## 更换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位镜像 + docker-arm64: image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0 + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-arm64 + dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: "v3.0.2" + version: v3.0.2 + channel: alpha-arm64 + args: "TARGETOS=linux,TARGETARCH=arm64" registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -60,14 +108,55 @@ pipeline: - source: REGISTRY_PASSWORD_ALIYUN target: REGISTRY_PASSWORD when: - branch: master - latest: + branch: + - dev + + ## 更换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: image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0 + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-ppc64le + dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: "v3.0" + version: v3.0.2 + channel: alpha-ppc64le + args: "TARGETOS=linux,TARGETARCH=ppc64le" registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -75,15 +164,103 @@ pipeline: - 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 + branch: + - dev + + 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: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-mips64le + dockerfile: .beagle/dockerfile + repo: wod/apaas-ui + version: v3.0.2 + channel: alpha-mips64le + args: "TARGETOS=linux,TARGETARCH=mips64le" + registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN target: REGISTRY_USER - source: REGISTRY_PASSWORD_ALIYUN target: REGISTRY_PASSWORD -branches: [master,dev] + when: + branch: + - dev + + 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: cloud-2 + deployment: awecloud-ui + container: awecloud-ui + imageurl: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha + when: + branch: + - dev diff --git a/.beagle/dockerfile b/.beagle/dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..798acf38a81161effca1ff0b7cbf6f30ab73164f --- /dev/null +++ b/.beagle/dockerfile @@ -0,0 +1,13 @@ +ARG BASE + +FROM $BASE + +ARG AUTHOR +ARG VERSION +LABEL maintainer=${AUTHOR} version=${VERSION} + +ARG TARGETOS +ARG TARGETARCH + +ADD ./dist /www +ADD ./build/conf.yaml /www/conf.yaml \ No newline at end of file