diff --git a/build/docker/Dockerfile.ansibleserver-base b/build/docker/Dockerfile.ansibleserver-base index 03a1546078..5c4affbc0f 100644 --- a/build/docker/Dockerfile.ansibleserver-base +++ b/build/docker/Dockerfile.ansibleserver-base @@ -9,12 +9,20 @@ RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /e # openssh-client, for ansible ssh connection # git, ca-certificates, for fetching ansible roles RUN set -x \ - && apk update \ - && apk add openssh-client \ - && apk add sshpass \ - && apk add ansible \ - && apk add py3-pip \ - && apk add tzdata git ca-certificates \ - && rm -rf /var/cache/apk/* + && apk update \ + && apk add openssh-client \ + && apk add sshpass \ + && apk add py3-pip \ + && apk add tzdata git ca-certificates -RUN pip3 install pywinrm +RUN apk add --no-cache openssh openssl curl rsync pv mariadb-client +RUN apk add --no-cache --virtual .build-dependencies \ + libffi-dev openssl-dev python3-dev build-base py-setuptools rust cargo mariadb-dev + +# ansible should be installed +# after setuptools and wheel +RUN pip3 install -U pip setuptools wheel \ + && pip3 install paramiko mysqlclient pywinrm \ + && pip3 install 'ansible<=9.0.0' \ + && apk del --no-network .build-dependencies \ + && rm -rf /root/.cache /root/.cargo /var/cache/apk/* diff --git a/build/docker/Makefile b/build/docker/Makefile index 3926b10616..0b63811c2a 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -15,7 +15,7 @@ onecloud-base: onecloud-base-3-15-4: $(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION_3-15-4) -f ./Dockerfile.onecloud-base-3-15-4 . -ANSIBLESERVER_BASE = v1.1.1 +ANSIBLESERVER_BASE = v1.1.2 ansibleserver-base: $(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base .