diff --git a/.beagle.yml b/.beagle.yml index e21d793ce4a8b653976f7342e761f900e835ac0c..19b2c2a190b5aee279c9202555c5161431d79a10 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 798acf38a81161effca1ff0b7cbf6f30ab73164f..d4edd1624be1ee3f5930ad335e2c5fd8b75a891a 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