diff --git a/app/ansible/Dockerfile b/app/ansible/Dockerfile index 98f82d9..af1d09b 100644 --- a/app/ansible/Dockerfile +++ b/app/ansible/Dockerfile @@ -1,37 +1,8 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-python310 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai -ENV PYTHON_HOME=/usr/local/python3 -ENV PATH="${PYTHON_HOME}/bin:$PATH" WORKDIR /home/admin -# https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tgz -# 由 build.sh 预先下载到本目录 -ADD Python-3.10.0.tgz ./ -RUN set -e && yum install \ - libffi-devel \ - zlib-devel \ - bzip2-devel \ - openssl-devel \ - ncurses-devel \ - sqlite-devel \ - readline-devel \ - tk-devel \ - gdbm-devel \ - libpcap-devel \ - xz-devel \ - make \ - patch \ - gcc \ - tar \ - sysstat \ - net-tools -y; \ - tar -xvf Python-3.10.0.tgz; \ - cd Python-3.10.0; \ - ./configure --prefix=/usr/local/python3; \ - make && make install; \ - python3 -V; \ - mkdir ~/.pip; -COPY pip.conf ~/.pip/ + RUN set -e && yum install -y \ epel-release \ ansible; \ No newline at end of file diff --git a/app/ansible/build.sh b/app/ansible/build.sh index d366446..613993d 100755 --- a/app/ansible/build.sh +++ b/app/ansible/build.sh @@ -3,13 +3,6 @@ set -euo pipefail cd "$(dirname "$0")" -PYTHON=Python-3.10.0.tgz -URL=https://www.python.org/ftp/python/3.10.0/${PYTHON} - -if [ ! -f "${PYTHON}" ]; then - curl -fL -o "${PYTHON}" "${URL}" -fi - -IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:tools-ansible +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:ansible docker build -t "${IMAGE}" . docker push "${IMAGE}" diff --git a/image/runtime-python310/build.sh b/image/runtime-python310/build.sh index e0af636..095b5f9 100755 --- a/image/runtime-python310/build.sh +++ b/image/runtime-python310/build.sh @@ -10,6 +10,6 @@ if [ ! -f "${PYTHON}" ]; then curl -fL -o "${PYTHON}" "${URL}" fi -IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-python3 +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-python310 docker build -t "${IMAGE}" . docker push "${IMAGE}"