Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Dockerfile

Dockerfile

@@ -2,7 +2,6 @@ FROM registry.cyberbrain.pw/docker/alpine:latest AS builder
 ENV PATH="/opt/ansible/bin:$PATH"
 RUN apk --no-cache add python3 && \
     apk --no-cache add --virtual build-dependencies \
-        py3-pip \
         musl-dev \
         python3-dev \
         libffi-dev \
@@ -15,15 +14,13 @@ RUN apk --no-cache add python3 && \
         setuptools \
         wheel \
         && \
-    ( test -z $ANSIBLE_VERSION && \
-        pip install --ignore-installed --user --no-cache-dir ansible || \
-        pip install --ignore-installed --user --no-cache-dir ansible\<=$ANSIBLE_VERSION \
-        ) && \
     pip3 install --ignore-installed --no-cache-dir \
+        ansible \
         ansible-lint \
         mitogen \
         jmespath \
         pywinrm \
+        patch \
         && \
     #apk del build-dependencies && \
     rm -rf /var/cache/apk/*
@@ -38,8 +35,6 @@ RUN apk --no-cache add \
         sshpass \
         openssh-client \
         rsync \
-        git \
-        && \
-    rm -rf /var/cache/apk/*
+        git
 COPY --from=builder /opt/ansible /opt/ansible
 CMD [ "ansible", "--version" ]