Merge pull request #5618 from zexi/automated-cherry-pick-of-#5617-upstream-release-3.1

Automated cherry pick of #5617: action: add region dns image
This commit is contained in:
yunion-ci-robot
2020-03-30 15:10:44 +08:00
committed by GitHub
3 changed files with 15 additions and 4 deletions
+11 -1
View File
@@ -39,7 +39,7 @@ jobs:
make cmd/cloudevent cmd/devtool
make cmd/*cli
make cmd/esxi-agent
make docker-alpine-build F='-j4 cmd/host cmd/vpcagent'
make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns'
- name: Image baremetal-agent
uses: elgohr/Publish-Docker-Github-Action@master
@@ -220,3 +220,13 @@ jobs:
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.devtool
- name: Image region DNS
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/region-dns
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.region-dns
+3 -2
View File
@@ -1,3 +1,4 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
FROM alpine:3.11.3
ADD ./_output/bin/region-dns /opt/yunion/bin/region-dns
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns
+1 -1
View File
@@ -38,7 +38,7 @@ build_bin() {
climc)
GOOS=linux make cmd/$1 cmd/*cli
;;
vpcagent|host)
vpcagent|host|region-dns)
docker run --rm \
-v $SRC_DIR:/root/go/src/yunion.io/x/onecloud \
-v $SRC_DIR/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \