diff --git a/CHANGELOG.md b/CHANGELOG.md index bc07533..b6879d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Add Ubuntu 24.04 - Add Alpine 3.20 - Support Ansible 10 (Core 2.17) +- Update to Mitogen 0.3.11 for Alpine 3.20, Debian 12 (Bookworm) and Ubuntu 24.04 ## v5.0.2 diff --git a/ansible-core/alpine320/Dockerfile b/ansible-core/alpine320/Dockerfile index 89b6583..b3856b6 100644 --- a/ansible-core/alpine320/Dockerfile +++ b/ansible-core/alpine320/Dockerfile @@ -7,6 +7,7 @@ ARG ANSIBLE_LINT ENV ANSIBLE_CORE_VERSION ${ANSIBLE_CORE_VERSION} ENV ANSIBLE_VERSION ${ANSIBLE_VERSION} ENV ANSIBLE_LINT ${ANSIBLE_LINT} +ENV MITOGEN_VERSION=0.3.11 # Labels. LABEL maintainer="will@willhallonline.co.uk" \ @@ -43,7 +44,7 @@ RUN apk --no-cache add \ pip3 install ansible-core==${ANSIBLE_CORE_VERSION} && \ pip3 install ansible==${ANSIBLE_VERSION} && \ pip3 install --ignore-installed ansible-lint==${ANSIBLE_LINT} && \ - pip3 install mitogen jmespath && \ + pip3 install mitogen==${MITOGEN_VERSION} jmespath && \ pip3 install --upgrade pywinrm && \ apk del build-dependencies && \ rm -rf /var/cache/apk/* && \ diff --git a/ansible-core/debian-bookworm-slim/Dockerfile b/ansible-core/debian-bookworm-slim/Dockerfile index 68397e3..55a1a37 100644 --- a/ansible-core/debian-bookworm-slim/Dockerfile +++ b/ansible-core/debian-bookworm-slim/Dockerfile @@ -6,6 +6,7 @@ ARG ANSIBLE_LINT ENV ANSIBLE_CORE_VERSION ${ANSIBLE_CORE_VERSION} ENV ANSIBLE_VERSION ${ANSIBLE_VERSION} ENV ANSIBLE_LINT ${ANSIBLE_LINT} +ENV MITOGEN_VERSION=0.3.11 # Labels. LABEL maintainer="will@willhallonline.co.uk" \ @@ -28,7 +29,7 @@ RUN rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED && \ pip3 install --upgrade pip cffi && \ pip3 install ansible-core==${ANSIBLE_CORE_VERSION} && \ pip3 install ansible==${ANSIBLE_VERSION} ansible-lint==${ANSIBLE_LINT} && \ - pip3 install mitogen jmespath && \ + pip3 install mitogen==${MITOGEN_VERSION} jmespath && \ pip install --upgrade pywinrm && \ rm -rf /root/.cache/pip diff --git a/ansible-core/debian-bookworm/Dockerfile b/ansible-core/debian-bookworm/Dockerfile index 4677f10..1f98174 100644 --- a/ansible-core/debian-bookworm/Dockerfile +++ b/ansible-core/debian-bookworm/Dockerfile @@ -6,6 +6,7 @@ ARG ANSIBLE_LINT ENV ANSIBLE_CORE_VERSION ${ANSIBLE_CORE_VERSION} ENV ANSIBLE_VERSION ${ANSIBLE_VERSION} ENV ANSIBLE_LINT ${ANSIBLE_LINT} +ENV MITOGEN_VERSION=0.3.11 # Labels. LABEL maintainer="will@willhallonline.co.uk" \ @@ -28,7 +29,7 @@ RUN rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED && \ pip3 install --upgrade pip cffi && \ pip3 install ansible-core==${ANSIBLE_CORE_VERSION} && \ pip3 install ansible==${ANSIBLE_VERSION} ansible-lint==${ANSIBLE_LINT} && \ - pip3 install mitogen jmespath && \ + pip3 install mitogen==${MITOGEN_VERSION} jmespath && \ pip install --upgrade pywinrm && \ rm -rf /root/.cache/pip diff --git a/ansible-core/ubuntu2404/Dockerfile b/ansible-core/ubuntu2404/Dockerfile index a7ef999..ea4539d 100644 --- a/ansible-core/ubuntu2404/Dockerfile +++ b/ansible-core/ubuntu2404/Dockerfile @@ -6,6 +6,7 @@ ARG ANSIBLE_LINT ENV ANSIBLE_CORE_VERSION ${ANSIBLE_CORE_VERSION} ENV ANSIBLE_VERSION ${ANSIBLE_VERSION} ENV ANSIBLE_LINT ${ANSIBLE_LINT} +ENV MITOGEN_VERSION=0.3.11 ENV PIPX_BIN_DIR=/usr/local/bin # Labels. @@ -22,13 +23,15 @@ LABEL maintainer="will@willhallonline.co.uk" \ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ apt-get install -y gnupg2 pipx sshpass git openssh-client && \ - apt-get install -y python3 python3-cffi python3-mitogen python3-jmespath && \ + apt-get install -y python3 python3-cffi python3-jmespath && \ rm -rf /var/lib/apt/lists/* && \ apt-get clean -RUN pipx install ansible-core==${ANSIBLE_CORE_VERSION} && \ +RUN rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED && \ + pipx install ansible-core==${ANSIBLE_CORE_VERSION} && \ pipx install ansible==${ANSIBLE_VERSION} ansible-lint==${ANSIBLE_LINT} && \ pipx install pywinrm --include-deps && \ + pip3 install mitogen==${MITOGEN_VERSION} \ rm -rf /root/.cache/pip* RUN mkdir /ansible && \