build: ansibleserver: use native alpine, include openssh

yunionio · Jul 16, 2020 · e5dd8ef · e5dd8ef
1 parent 916943a
commit e5dd8ef
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/build/docker/Dockerfile.ansibleserver b/build/docker/Dockerfile.ansibleserver
@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v3.3
+FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:1.0.0
 
-ADD ./_output/bin/ansibleserver /opt/yunion/bin/ansibleserver
+ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver
diff --git a/build/docker/Dockerfile.ansibleserver-base b/build/docker/Dockerfile.ansibleserver-base
@@ -1,13 +1,12 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk update && \
-    apk add --no-cache tzdata git ansible ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+FROM alpine:3.11.6
+
+MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
+
+# openssh-client, for ansible ssh connection
+# git, ca-certificates, for fetching ansible roles
+RUN set -x \
+	&& apk update \
+	&& apk add openssh-client \
+	&& apk add ansible \
+	&& apk add tzdata git ca-certificates \
+	&& rm -rf /var/cache/apk/*
diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh
@@ -38,7 +38,10 @@ build_bin() {
 		climc)
 			GOOS=linux make cmd/$1 cmd/*cli
 			;;
-		vpcagent|host|region-dns)
+		ansibleserver|\
+		host|\
+		region-dns|\
+		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 \