diff --git a/Dockerfile b/Dockerfile index 6e8e52f..687e96f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG BUILD_VERSION # renovate: datasource=pypi depName=molecule ENV MOLECULE_VERSION="${BUILD_VERSION:-3.2.3}" # renovate: datasource=pypi depName=ansible -ENV ANSIBLE_VERSION="${ANSIBLE_VERSION:-2.10.6}" +ENV ANSIBLE_VERSION="${ANSIBLE_VERSION:-2.10.7}" ENV PY_COLORS=1 \ ANSIBLE_FORCE_COLOR=true \ @@ -23,15 +23,15 @@ ENV PY_COLORS=1 \ COPY overlay/ / RUN apk add --update --no-cache --virtual .build-deps gcc make libffi-dev musl-dev \ - openssl-dev python3-dev && \ + openssl-dev python3-dev cargo && \ apk add --update --no-cache git openssh-client && \ - echo "Installing ansible 'v$ANSIBLE_VERSION' ..." && \ - pip install -qq --upgrade --no-cache-dir pip setuptools~=49.0 requests~=2.23 && \ - pip install -qq --no-cache-dir ansible=="$ANSIBLE_VERSION" && \ echo "Installing requirements ..." && \ + pip install -qq --upgrade --no-cache-dir pip && \ + pip install -qq --no-cache-dir -r /root/requirements.txt && \ + echo "Installing ansible 'v$ANSIBLE_VERSION' ..." && \ + pip install -qq --no-cache-dir ansible=="$ANSIBLE_VERSION" && \ MOLECULE_VERSION="${MOLECULE_VERSION##v}" && \ MOLECULE_MAJOR="${MOLECULE_VERSION%%.*}" && \ - pip install -qq --no-cache-dir -r /root/requirements.txt && \ if [ -z "${MOLECULE_MAJOR//[0-9]}" ] && [ -n "$MOLECULE_MAJOR" ]; then \ echo "Installing molecule version '$MOLECULE_VERSION' ..." && \ pip install -qq --no-cache-dir molecule[docker,podman,lint]=="$MOLECULE_VERSION"; \