diff --git a/Dockerfile b/Dockerfile index a2bb263..e2a589c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,6 @@ LABEL maintainer="Robert Kaussow " \ ARG ANSIBLE_VERSION=2.9.0 ARG MOLECULE_VERSION=latest -ARG TEST="${MOLECULE_VERSION}" ENV PY_COLORS=1 \ USER=root \ @@ -16,29 +15,26 @@ 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 && \ - # apk add --update --no-cache git openssh-client && \ +RUN apk add --update --no-cache --virtual .build-deps gcc make libffi-dev musl-dev \ + openssl-dev python3-dev && \ + apk add --update --no-cache git openssh-client && \ # Required to fix hcloud dependency: # hcloud 1.6.3 has requirement requests<2.23,>=2.20, but you'll have requests 2.23.0 - # echo "Installing ansible 'v$ANSIBLE_VERSION' ..." && \ - # pip install -qq --upgrade --no-cache-dir pip setuptools requests~=2.22.0 && \ - # pip install -qq --no-cache-dir ansible~="$ANSIBLE_VERSION" && \ - # echo "Installing requirements ..." && \ - echo "$TEST" && \ - # MOLECULE_VERSION="${MOLECULE_VERSION#v}" && \ - # MOLECULE_MAJOR="${MOLECULE_VERSION%%.*}" && \ - echo "$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 'v$MOLECULE_VERSION' ..." && \ - # pip install -qq --no-cache-dir molecule~="$MOLECULE_VERSION"; \ - # else \ - # echo "Installing latest molecule ..." && \ - # pip install -qq --no-cache-dir molecule; \ - # fi && \ - # apk del .build-deps && \ + echo "Installing ansible 'v$ANSIBLE_VERSION' ..." && \ + pip install -qq --upgrade --no-cache-dir pip setuptools requests~=2.22.0 && \ + pip install -qq --no-cache-dir ansible~="$ANSIBLE_VERSION" && \ + echo "Installing requirements ..." && \ + 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 'v$MOLECULE_VERSION' ..." && \ + pip install -qq --no-cache-dir molecule~="$MOLECULE_VERSION"; \ + else \ + echo "Installing latest molecule ..." && \ + pip install -qq --no-cache-dir molecule; \ + fi && \ + apk del .build-deps && \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* && \ rm -rf /root/.cache/