From d1cb6c1bb86e2c71135739252a8f40759fa49b66 Mon Sep 17 00:00:00 2001 From: zhangjun1 Date: Thu, 5 May 2022 16:35:57 +0800 Subject: [PATCH] 3.0.2 --- .beagle.yml | 8 +++----- build/dockerfile | 10 ++-------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.beagle.yml b/.beagle.yml index e21d793..19b2c2a 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -51,11 +51,9 @@ pipeline: volumes: - /var/run/docker.sock:/var/run/docker.sock base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5 - dockerfile: .beagle/dockerfile repo: gzgajzapi/apaas-ui - version: v3.0.1 + version: v3.0.2 channel: alpha - args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数 registry: hub.wodcloud.com secrets: - source: REGISTRY_USER @@ -71,8 +69,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: hub.wodcloud.com/gzgajzapi/apaas-ui:v3.0.1-alpha - target: hub.wodcloud.com/gzgajzapi/apaas-ui:v3.0.1 + source: hub.wodcloud.com/gzgajzapi/apaas-ui:v3.0.2-alpha + target: hub.wodcloud.com/gzgajzapi/apaas-ui:v3.0.2 registry: hub.wodcloud.com secrets: - source: REGISTRY_USER diff --git a/build/dockerfile b/build/dockerfile index 798acf3..d4edd16 100644 --- a/build/dockerfile +++ b/build/dockerfile @@ -1,13 +1,7 @@ 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 +ADD ./dist /usr/share/nginx/html +ADD ./build/nginx.conf /etc/nginx/nginx.conf \ No newline at end of file -- 2.26.0