From 0c0c4fc94da59f83235d192c319dce891ae04a04 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Mon, 24 Feb 2020 22:20:18 +0800 Subject: [PATCH] build: build vpcagent container --- build/docker/Dockerfile.vpcagent | 6 ++++++ scripts/docker_push.sh | 20 +++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 build/docker/Dockerfile.vpcagent diff --git a/build/docker/Dockerfile.vpcagent b/build/docker/Dockerfile.vpcagent new file mode 100644 index 0000000000..b85e578acb --- /dev/null +++ b/build/docker/Dockerfile.vpcagent @@ -0,0 +1,6 @@ +FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.9.6-1 + +MAINTAINER "Yousong Zhou " + +RUN mkdir -p /opt/yunion/bin +ADD ./_output/alpine-build/bin/vpcagent /opt/yunion/bin/vpcagent diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index e58c7262bf..34474e3046 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -34,11 +34,21 @@ REGISTRY=${REGISTRY:-docker.io/yunion} TAG=${TAG:-latest} build_bin() { - if [[ "$1" == "climc" ]]; then - GOOS=linux make cmd/$1 cmd/*cli - else - GOOS=linux make cmd/$1 - fi + case "$1" in + climc) + GOOS=linux make cmd/$1 cmd/*cli + ;; + vpcagent) + 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 \ + registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-1 \ + /bin/sh -c "set -ex; cd /root/go/src/yunion.io/x/onecloud; make cmd/$1" + ;; + *) + GOOS=linux make cmd/$1 + ;; + esac }