From 00b0146e493e4053e69e945a8ba2328f44a8eae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=B0=B8=E4=BA=AE?= Date: Mon, 9 Jan 2023 10:55:15 +0800 Subject: [PATCH] Update .beagle.yml, Dockerfile files --- .beagle.yml | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++ Dockerfile | 6 ++-- 2 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 .beagle.yml diff --git a/.beagle.yml b/.beagle.yml new file mode 100644 index 0000000..de4f0cc --- /dev/null +++ b/.beagle.yml @@ -0,0 +1,91 @@ +kind: pipeline +name: docker + +platform: + runner: 10.11.92.36 + + + +volumes: + - name: docker + host: + path: /var/run/docker.sock + +steps: + - name: docker-amd64 + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 + volumes: + - name: docker + path: /var/run/docker.sock + settings: + dockerfile: ./Dockerfile + registry: registry.cn-qingdao.aliyuncs.com + repo: wod/rcache + tag: 7.0.7 + registry_user: + from_secret: REGISTRY_USER_ALIYUN + registry_password: + from_secret: REGISTRY_PASSWORD_ALIYUN + + + + - name: docker-arm64 + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 + volumes: + - name: docker + path: /var/run/docker.sock + settings: + dockerfile: .beagle/dockerfile + base: registry.cn-qingdao.aliyuncs.com/wod/openjdk:11-jre-slim-arm64 + registry: registry.cn-qingdao.aliyuncs.com + repo: wod/openjdk + tag: 11-jdk-slim-migration-arm64 + registry_user: + from_secret: REGISTRY_USER_ALIYUN + registry_password: + from_secret: REGISTRY_PASSWORD_ALIYUN + + + - name: docker-ppc64le + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 + volumes: + - name: docker + path: /var/run/docker.sock + settings: + dockerfile: .beagle/dockerfile + registry: registry.cn-qingdao.aliyuncs.com + repo: wod/openjdk + tag: 11-jdk-slim-migration-ppc64le + registry_user: + from_secret: REGISTRY_USER_ALIYUN + registry_password: + from_secret: REGISTRY_PASSWORD_ALIYUN + + + - name: docker-arch + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-manifest:v1.2.3 + volumes: + - name: docker + path: /var/run/docker.sock + settings: + platforms: linux/amd64,linux/arm64,linux/ppc64le + template: registry.cn-qingdao.aliyuncs.com/wod/openjdk:11-jdk-slim-migration-ARCH + target: registry.cn-qingdao.aliyuncs.com/wod/openjdk:11-jre-slim + username: + from_secret: REGISTRY_USER_ALIYUN + password: + from_secret: REGISTRY_PASSWORD_ALIYUN + +--- +kind: secret +name: REGISTRY_USER_ALIYUN +get: + path: devops-registry-aliyun + name: USERNAME + +--- +kind: secret +name: REGISTRY_PASSWORD_ALIYUN +get: + path: devops-registry-aliyun + name: PASSWORD diff --git a/Dockerfile b/Dockerfile index 2358b26..aa2ad00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM alpine:3.15 as builder +ARG BASE + +FROM $BASE as builder MAINTAINER Opstree Solutions @@ -19,7 +21,7 @@ RUN curl -fL -Lo /tmp/redis-${REDIS_VERSION}.tar.gz https://dl.wodcloud.com/lyl/ make && \ make install BUILD_TLS=yes -FROM alpine:3.15 +FROM $BASE MAINTAINER Opstree Solutions -- 2.26.0