diff --git a/Dockerfile b/Dockerfile index ae53516..d38a96d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,34 +10,31 @@ ARG REPO_USERNAME ARG REPO_PASSWORD ADD https://${REPO_USERNAME}:${REPO_PASSWORD}@sn.itch.fyi/Repository/bin/VMware/ovftool/4.4.x/${OVFTOOL_INSTALLER} /tmp/ovftool-installer -RUN apk --update add --no-cache \ - curl && \ - curl -L "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" -o /tmp/packages-microsoft-prod.deb {} - FROM debian:11-slim COPY --from=packer /bin/packer /bin/packer COPY --from=terraform /bin/terraform /bin/terraform -COPY --from=download /tmp/packages-microsoft-prod.deb /tmp/packages-microsoft-prod.deb COPY --from=download /tmp/ovftool-installer /tmp/ovftool-installer ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -RUN dpkg -i /tmp/packages-microsoft-prod.deb || true && \ - apt-get update && apt-get install -y --fix-broken && \ - rm -f /tmp/packages-microsoft-prod.deb && \ +RUN apt-get update && apt-get install -y --no-install-recommends \ + apt-transport-https \ + curl \ + gnupg && \ + curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \ + echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-debian-bullseye-prod bullseye main" > /etc/apt/sources.list.d/microsoft.list && \ apt-get upgrade -y && apt-get install -y --no-install-recommends \ # (build-essential) Dependency for installation of InSpec build-essential \ - curl \ git \ jq \ locales \ netcat-openbsd \ openssh-client \ - powershell-lts \ + powershell \ # (python3-*) Dependency for installation of Ansible python3-pip \ python3-setuptools \ @@ -66,8 +63,10 @@ RUN dpkg -i /tmp/packages-microsoft-prod.deb || true && \ pwsh -Command "Set-PowerCLIConfiguration -Scope User -ParticipateInCEIP \$False -Confirm:\$False" && \ sh /tmp/ovftool-installer --console --eulas-agreed --required && \ apt-get remove -y \ + apt-transport-https \ build-essential \ - curl && \ + curl \ + gnupg && \ apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* && \ rm -f /tmp/ovftool-installer