Merge branch 'master' into fix_apt_cruft2
This commit is contained in:
commit
c32e9c4d26
|
@ -24,15 +24,15 @@ RUN apt-get update \
|
||||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||||
software-properties-common ca-certificates \
|
software-properties-common ca-certificates \
|
||||||
gpg gpg-agent \
|
gpg gpg-agent \
|
||||||
ansible python-passlib python3-passlib \
|
ansible python3-passlib \
|
||||||
libcap2-bin build-essential\
|
libcap2-bin build-essential\
|
||||||
&& c_rehash \
|
&& c_rehash \
|
||||||
&& ansible-playbook -c local -i localhost, --extra-vars "ansible_python_interpreter=/usr/bin/python2" /opt/ansible/snikket.yml \
|
&& ansible-playbook -c local -i localhost, --extra-vars "ansible_python_interpreter=/usr/bin/python3" /opt/ansible/snikket.yml \
|
||||||
&& apt-get remove --purge -y \
|
&& apt-get remove --purge -y \
|
||||||
ansible \
|
ansible \
|
||||||
software-properties-common \
|
software-properties-common \
|
||||||
gpg gpg-agent \
|
gpg gpg-agent \
|
||||||
python-passlib python3-passlib \
|
python3-passlib \
|
||||||
mercurial libcap2-bin build-essential \
|
mercurial libcap2-bin build-essential \
|
||||||
python3 python3.7-minimal \
|
python3 python3.7-minimal \
|
||||||
&& apt-get autoremove -y \
|
&& apt-get autoremove -y \
|
||||||
|
|
Loading…
Reference in New Issue