diff --git a/Dockerfile b/Dockerfile index e4d3c2c2c495668c0cc7beca249e2e2d9db341a8..4bbdc4b9f4dc540eb030baa610ae159383709939 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,45 +2,18 @@ FROM registry.cyberbrain.pw/docker/alpine:latest AS builder ARG ANSIBLE_VERSION ENV PATH="/opt/ansible/bin:$PATH" RUN apk --no-cache add python3 && \ - apk --no-cache add --virtual build-dependencies \ - musl-dev \ - python3-dev \ - libffi-dev \ - openssl-dev \ - cargo \ - && \ + apk --no-cache add --virtual build-dependencies musl-dev python3-dev libffi-dev openssl-dev yaml-dev cargo && \ python3 -m venv /opt/ansible && \ - pip3 install --ignore-installed --no-cache-dir --upgrade \ - pip \ - setuptools \ - wheel \ - && \ - ( test -z $ANSIBLE_VERSION && \ - pip install --ignore-installed --no-cache-dir ansible || \ - pip install --ignore-installed --no-cache-dir ansible\<=$ANSIBLE_VERSION \ - ) && \ - pip3 install --ignore-installed --no-cache-dir \ - ansible-lint \ - mitogen \ - jmespath \ - pywinrm \ - patch \ - && \ + pip3 install --ignore-installed --no-cache-dir --upgrade pip setuptools wheel && \ + export ANSIBLE_PACKAGES="pyyaml ansible-lint mitogen jmespath pywinrm patch hvac" && \ + ( test -z $ANSIBLE_VERSION && pip install --ignore-installed --no-cache-dir ansible ${ANSIBLE_PACKAGES} || pip install --ignore-installed --no-cache-dir ansible\<=$ANSIBLE_VERSION ${ANSIBLE_PACKAGES} ) && \ #apk del build-dependencies && \ rm -rf /var/cache/apk/* FROM registry.cyberbrain.pw/docker/alpine:latest AS runtime ENV PATH="/opt/ansible/bin:$PATH" WORKDIR /srv/ansible -RUN apk --no-cache add \ - python3 \ - openssl \ - ca-certificates \ - sshpass \ - openssh-client \ - rsync \ - git \ - && \ +RUN apk --no-cache add python3 yaml openssl ca-certificates sshpass openssh-client rsync git && \ rm -rf /var/cache/apk/* COPY --from=builder /opt/ansible /opt/ansible CMD [ "ansible", "--version" ]