From 631cab90cb05170e06d84d6d94d42a2fe08dc395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= Date: Thu, 28 Jan 2021 14:28:32 +0800 Subject: [PATCH] up new cicd --- .beagle-arm.yml | 75 -------------- .beagle.yml | 247 ++++++++++++++++++++++++++++++++++++++------- .beagle/dockerfile | 13 +++ 3 files changed, 223 insertions(+), 112 deletions(-) delete mode 100644 .beagle-arm.yml create mode 100644 .beagle/dockerfile diff --git a/.beagle-arm.yml b/.beagle-arm.yml deleted file mode 100644 index ba3c1f3..0000000 --- a/.beagle-arm.yml +++ /dev/null @@ -1,75 +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 - mount: - - ./node_modules - volumes: - - /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/v1 - 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 - volumes: - - /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/bg-login-base-arm64:v3.0.0-apaasv3 - repo: wod/apaas-login-arm64 - registry: registry.cn-qingdao.aliyuncs.com - version: "v3.0.1" - channel: alpha - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: dev - docker-branch: - 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/bg-login-base-arm64:v3.0.0-apaasv3 - repo: wod/apaas-login-arm64 - registry: registry.cn-qingdao.aliyuncs.com - version: "v3.0.1" - channel: branch - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: - exclude: [master,dev] - 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/bg-login-base-arm64:v3.0.0-apaasv3 - repo: wod/apaas-login-arm64 - registry: registry.cn-qingdao.aliyuncs.com - version: "v3.0" - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - - - \ No newline at end of file diff --git a/.beagle.yml b/.beagle.yml index 7ae2ca3..411c7aa 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -1,40 +1,58 @@ -platform: 10.11.92.33 +platform: 10.11.92.34 + clone: git: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/git:1.4.0 + 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:latest + image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0 restore: true mount: - ./node_modules volumes: - - /cache:/cache + - /data/cache:/cache + when: + branch: + - dev + ## 构建 build: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/node:8.15.0-onbuild + 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/v1 + - /data/cache/yarn:/usr/local/share/.cache/yarn commands: - - yarn install - - yarn run build + - yarn + - yarn build + when: + branch: + - dev + store-cache: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/cache:latest + image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0 rebuild: true mount: - - ./node_modules + - ./node_modules volumes: - - /cache:/cache + - /data/cache:/cache + when: + branch: + - dev + + ## 编译成静态文件 docker: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0 + 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/bg-login-base:v3.0.2-apaasv3 + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod/bg-login-base:v3.0 + dockerfile: .beagle/dockerfile repo: wod/apaas-login - version: "v3.0.0" + version: v3.0.1 channel: alpha + args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数 registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -42,14 +60,56 @@ pipeline: - source: REGISTRY_PASSWORD_ALIYUN target: REGISTRY_PASSWORD when: - branch: dev - docker-master: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0 + 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-login:v3.0.1-alpha + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-login:v3.0.1 + 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-login:v3.0.1 + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-login: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/bg-login-base:v3.0.2-apaasv3 + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod/bg-login-base:v3.0-arm64 + dockerfile: .beagle/dockerfile repo: wod/apaas-login - version: "v3.0.0" + version: v3.0.1 + channel: alpha-arm64 + args: "TARGETOS=linux,TARGETARCH=arm64" registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -57,16 +117,56 @@ pipeline: - source: REGISTRY_PASSWORD_ALIYUN target: REGISTRY_PASSWORD when: - branch: master - docker-branch: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0 + 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-login:v3.0.1-alpha-arm64 + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-login:v3.0.1-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-login:v3.0.1-arm64 + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-login: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/bg-login-base:v3.0.2-apaasv3 + base: registry.cn-qingdao.aliyuncs.com/wod/bg-login-base:v3.0-ppc64le + dockerfile: .beagle/dockerfile repo: wod/apaas-login + version: v3.0.1 + channel: alpha-ppc64le + args: "TARGETOS=linux,TARGETARCH=ppc64le" registry: registry.cn-qingdao.aliyuncs.com - version: "v3.0.0" - channel: branch secrets: - source: REGISTRY_USER_ALIYUN target: REGISTRY_USER @@ -74,29 +174,102 @@ pipeline: target: REGISTRY_PASSWORD when: branch: - exclude: [master,dev] - latest: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0 + - 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-login:v3.0.1-alpha-ppc64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-login:v3.0.1-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-login:v3.0.1-ppc64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-login: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/bg-login-base:v3.0.2-apaasv3 + base: registry.cn-qingdao.aliyuncs.com/wod/bg-login-base:v3.0-mips64le + dockerfile: .beagle/dockerfile repo: wod/apaas-login + version: v3.0.1 + channel: alpha-mips64le + args: "TARGETOS=linux,TARGETARCH=mips64le" registry: registry.cn-qingdao.aliyuncs.com - version: "v3.0" secrets: - source: REGISTRY_USER_ALIYUN target: REGISTRY_USER - source: REGISTRY_PASSWORD_ALIYUN target: REGISTRY_PASSWORD when: - branch: master + 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-login:v3.0.1-alpha-mips64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-login:v3.0.1-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-login:v3.0.1-mips64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-login: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-login container: apaas-login - registry: registry.cn-qingdao.aliyuncs.com + registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-login:v3.0.1-alpha when: - branch: [master,dev] - - \ No newline at end of file + branch: + - dev diff --git a/.beagle/dockerfile b/.beagle/dockerfile new file mode 100644 index 0000000..798acf3 --- /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 -- 2.26.0