diff --git a/Makefile b/Makefile index 232bd0a028..1568f6cf3d 100644 --- a/Makefile +++ b/Makefile @@ -236,6 +236,8 @@ help: export helpText:=$(helpText) help: @echo "$$helpText" +.PHONY: help + gen-model-api-check: which model-api-gen || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/model-api-gen) diff --git a/build/docker/Dockerfile.apigateway b/build/docker/Dockerfile.apigateway index 23125bfcb1..61407f056d 100644 --- a/build/docker/Dockerfile.apigateway +++ b/build/docker/Dockerfile.apigateway @@ -1,15 +1,3 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 - -MAINTAINER "Zexi Li " - -ENV TZ Asia/Shanghai - -RUN mkdir -p /opt/yunion/bin - -RUN apk update && \ - apk add --no-cache tzdata ca-certificates && \ - rm -rf /var/cache/apk/* - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest ADD ./_output/bin/apigateway /opt/yunion/bin/apigateway diff --git a/build/docker/Dockerfile.climc b/build/docker/Dockerfile.climc index 8636fd7b9c..8d38cca2fd 100644 --- a/build/docker/Dockerfile.climc +++ b/build/docker/Dockerfile.climc @@ -13,4 +13,4 @@ ENV PATH="/opt/yunion/bin:${PATH}" RUN mkdir -p /opt/yunion/bin -ADD ./_output/bin/climc /opt/yunion/bin/climc +ADD ./_output/bin/climc ./_output/bin/*cli /opt/yunion/bin/ diff --git a/build/docker/Dockerfile.cloudevent b/build/docker/Dockerfile.cloudevent index 14cbe7757b..9f1e260994 100644 --- a/build/docker/Dockerfile.cloudevent +++ b/build/docker/Dockerfile.cloudevent @@ -1,15 +1,3 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 - -MAINTAINER "Zexi Li " - -ENV TZ Asia/Shanghai - -RUN mkdir -p /opt/yunion/bin - -RUN apk update && \ - apk add --no-cache tzdata ca-certificates && \ - rm -rf /var/cache/apk/* - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest ADD ./_output/bin/cloudevent /opt/yunion/bin/cloudevent diff --git a/build/docker/Dockerfile.cloudnet b/build/docker/Dockerfile.cloudnet index 6a85b3879e..13be461982 100644 --- a/build/docker/Dockerfile.cloudnet +++ b/build/docker/Dockerfile.cloudnet @@ -1,15 +1,3 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 - -MAINTAINER "Zexi Li " - -RUN apk update && \ - apk add --no-cache tzdata ca-certificates && \ - rm -rf /var/cache/apk/* - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - -ENV TZ Asia/Shanghai - -RUN mkdir -p /opt/yunion/bin +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest ADD ./_output/bin/cloudnet /opt/yunion/bin/cloudnet diff --git a/build/docker/Dockerfile.keystone b/build/docker/Dockerfile.keystone index a4252474c1..8aee8340fd 100644 --- a/build/docker/Dockerfile.keystone +++ b/build/docker/Dockerfile.keystone @@ -1,15 +1,3 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 - -MAINTAINER "Zexi Li " - -ENV TZ Asia/Shanghai - -RUN apk update && \ - apk add --no-cache tzdata ca-certificates && \ - rm -rf /var/cache/apk/* - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - -RUN mkdir -p /opt/yunion/bin +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest ADD ./_output/bin/keystone /opt/yunion/bin/keystone diff --git a/build/docker/Dockerfile.logger b/build/docker/Dockerfile.logger index 6faa2f6ae0..ae8a26d256 100644 --- a/build/docker/Dockerfile.logger +++ b/build/docker/Dockerfile.logger @@ -1,16 +1,4 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 - -MAINTAINER "Zexi Li " - -ENV TZ Asia/Shanghai - -RUN apk update && \ - apk add --no-cache tzdata ca-certificates && \ - rm -rf /var/cache/apk/* - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - -RUN mkdir -p /opt/yunion/bin +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest ADD ./_output/bin/logger /opt/yunion/bin/logger diff --git a/build/docker/Dockerfile.notify b/build/docker/Dockerfile.notify index 6c083507b8..c982cd8da9 100644 --- a/build/docker/Dockerfile.notify +++ b/build/docker/Dockerfile.notify @@ -1,16 +1,4 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 - -MAINTAINER "Zexi Li " - -ENV TZ Asia/Shanghai - -RUN mkdir -p /opt/yunion/bin - -RUN apk update && \ - apk add --no-cache tzdata ca-certificates && \ - rm -rf /var/cache/apk/* - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest COPY ./build/notify/root/opt/ /opt/ ADD ./_output/bin/notify /opt/yunion/bin/notify diff --git a/build/docker/Dockerfile.region-base b/build/docker/Dockerfile.onecloud-base similarity index 74% rename from build/docker/Dockerfile.region-base rename to build/docker/Dockerfile.onecloud-base index 0e1f62fe07..6e9908a7e3 100644 --- a/build/docker/Dockerfile.region-base +++ b/build/docker/Dockerfile.onecloud-base @@ -1,11 +1,13 @@ FROM frolvlad/alpine-glibc:glibc-2.28 -MAINTAINER "Yaoqi Wan " +MAINTAINER "Zexi Li " + +ENV TZ Asia/Shanghai + +RUN mkdir -p /opt/yunion/bin RUN apk update && \ apk add --no-cache tzdata ca-certificates && \ rm -rf /var/cache/apk/* RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - -ENV TZ Asia/Shanghai diff --git a/build/docker/Dockerfile.region b/build/docker/Dockerfile.region index bc9adc542e..df31153a9a 100644 --- a/build/docker/Dockerfile.region +++ b/build/docker/Dockerfile.region @@ -1,8 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/region-base:latest - -MAINTAINER "Zexi Li " - -RUN mkdir -p /opt/yunion/bin +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest COPY ./build/region/root/opt/ /opt/ ADD ./_output/bin/region /opt/yunion/bin/region diff --git a/build/docker/Dockerfile.region-dns b/build/docker/Dockerfile.region-dns index 6933634cc7..9685f4291a 100644 --- a/build/docker/Dockerfile.region-dns +++ b/build/docker/Dockerfile.region-dns @@ -1,9 +1,3 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 - -MAINTAINER "Zexi Li " - -ENV TZ Asia/Shanghai - -RUN mkdir -p /opt/yunion/bin +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest ADD ./_output/bin/region-dns /opt/yunion/bin/region-dns diff --git a/build/docker/Dockerfile.s3gateway b/build/docker/Dockerfile.s3gateway index aca0135013..f1fb5a9509 100644 --- a/build/docker/Dockerfile.s3gateway +++ b/build/docker/Dockerfile.s3gateway @@ -1,15 +1,3 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 - -MAINTAINER "Zexi Li " - -ENV TZ Asia/Shanghai - -RUN mkdir -p /opt/yunion/bin - -RUN apk update && \ - apk add --no-cache tzdata ca-certificates && \ - rm -rf /var/cache/apk/* - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest ADD ./_output/bin/s3gateway /opt/yunion/bin/s3gateway diff --git a/build/docker/Dockerfile.scheduler b/build/docker/Dockerfile.scheduler index c2ad5c7602..e07116fc5d 100644 --- a/build/docker/Dockerfile.scheduler +++ b/build/docker/Dockerfile.scheduler @@ -1,15 +1,3 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 - -MAINTAINER "Zexi Li " - -ENV TZ Asia/Shanghai - -RUN apk update && \ - apk add --no-cache tzdata ca-certificates && \ - rm -rf /var/cache/apk/* - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - -RUN mkdir -p /opt/yunion/bin +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest ADD ./_output/bin/scheduler /opt/yunion/bin/scheduler diff --git a/build/docker/Dockerfile.yunionconf b/build/docker/Dockerfile.yunionconf index 2a97891a02..7b3fa28f96 100644 --- a/build/docker/Dockerfile.yunionconf +++ b/build/docker/Dockerfile.yunionconf @@ -1,16 +1,4 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 - -MAINTAINER "Zexi Li " - -ENV TZ Asia/Shanghai - -RUN apk update && \ - apk add --no-cache tzdata ca-certificates && \ - rm -rf /var/cache/apk/* - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - -RUN mkdir -p /opt/yunion/bin +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest ADD ./_output/bin/yunionconf /opt/yunion/bin/yunionconf diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index a10f8a9605..e58c7262bf 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -34,7 +34,11 @@ REGISTRY=${REGISTRY:-docker.io/yunion} TAG=${TAG:-latest} build_bin() { - GOOS=linux make cmd/$1 + if [[ "$1" == "climc" ]]; then + GOOS=linux make cmd/$1 cmd/*cli + else + GOOS=linux make cmd/$1 + fi } @@ -66,6 +70,10 @@ COMPONENTS=$@ cd $SRC_DIR for component in $COMPONENTS; do + if [[ $component == *cli ]]; then + echo "Please build image for climc" + continue + fi build_bin $component build_bundle_libraries $component img_name="$REGISTRY/$component:$TAG"