From 2190de3e77d86d6b165251c9118bb5729cd333a0 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Mon, 30 Mar 2020 11:12:52 +0800 Subject: [PATCH] action: add region dns image --- .github/workflows/docker.yml | 12 +++++++++++- build/docker/Dockerfile.region-dns | 5 +++-- scripts/docker_push.sh | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b411762e58..9e630496f6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -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 diff --git a/build/docker/Dockerfile.region-dns b/build/docker/Dockerfile.region-dns index 9685f4291a..44188a3d79 100644 --- a/build/docker/Dockerfile.region-dns +++ b/build/docker/Dockerfile.region-dns @@ -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 diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index 37e5f34268..82c20c347b 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -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 \