From bebd5b4cfa35f0961a1af1d5353da18574e34511 Mon Sep 17 00:00:00 2001 From: JeanneD4RK Date: Sun, 16 Jul 2023 17:46:19 +0200 Subject: [PATCH 1/3] Added sshpass to image --- 1.9/Dockerfile | 2 +- 2.0/Dockerfile | 2 +- 2.1/Dockerfile | 2 +- 2.10/Dockerfile | 2 +- 2.2/Dockerfile | 2 +- 2.3/Dockerfile | 2 +- 2.4/Dockerfile | 2 +- 2.5/Dockerfile | 2 +- 2.6/Dockerfile | 2 +- 2.7/Dockerfile | 2 +- 2.8/Dockerfile | 2 +- 4.0/Dockerfile | 2 +- 4.5/Dockerfile | 2 +- 6.0/Dockerfile | 2 +- 7.3/Dockerfile | 2 +- Dockerfile | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/1.9/Dockerfile b/1.9/Dockerfile index 999b6bf..4d9c5d9 100644 --- a/1.9/Dockerfile +++ b/1.9/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible~=1.9.0 dnspython diff --git a/2.0/Dockerfile b/2.0/Dockerfile index 6e70ddd..81a5acb 100644 --- a/2.0/Dockerfile +++ b/2.0/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible~=2.0.0 dnspython diff --git a/2.1/Dockerfile b/2.1/Dockerfile index fc1c27e..c99f3fd 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim &&\ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass &&\ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible~=2.1.0 dnspython diff --git a/2.10/Dockerfile b/2.10/Dockerfile index 0a615c4..21af61a 100644 --- a/2.10/Dockerfile +++ b/2.10/Dockerfile @@ -1,7 +1,7 @@ FROM python:3 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible~=2.10 paramiko diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 1c46942..5758316 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible~=2.2.0 dnspython diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 6ecf623..4211aac 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible~=2.3.0 dnspython diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 750110e..61cb12a 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible~=2.4.0 dnspython diff --git a/2.5/Dockerfile b/2.5/Dockerfile index d6ea4f9..b7888b6 100644 --- a/2.5/Dockerfile +++ b/2.5/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible~=2.5.0 dnspython diff --git a/2.6/Dockerfile b/2.6/Dockerfile index b87e9c1..5a99455 100644 --- a/2.6/Dockerfile +++ b/2.6/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible~=2.6.0 dnspython diff --git a/2.7/Dockerfile b/2.7/Dockerfile index f938bbe..4121d20 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible~=2.7.0 dnspython diff --git a/2.8/Dockerfile b/2.8/Dockerfile index 79ab32b..d5b81b7 100644 --- a/2.8/Dockerfile +++ b/2.8/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible~=2.8.0 dnspython boto3==1.12.12 botocore==1.15.12 diff --git a/4.0/Dockerfile b/4.0/Dockerfile index 1f3cba9..bd4190e 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -1,7 +1,7 @@ FROM python:3-slim-bullseye RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/4.5/Dockerfile b/4.5/Dockerfile index ec91258..53531b5 100644 --- a/4.5/Dockerfile +++ b/4.5/Dockerfile @@ -1,7 +1,7 @@ FROM python:3-slim-bullseye RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/6.0/Dockerfile b/6.0/Dockerfile index 1417699..450c5e7 100644 --- a/6.0/Dockerfile +++ b/6.0/Dockerfile @@ -1,7 +1,7 @@ FROM python:3-slim-bullseye RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/7.3/Dockerfile b/7.3/Dockerfile index 79e156a..d4b4203 100644 --- a/7.3/Dockerfile +++ b/7.3/Dockerfile @@ -1,7 +1,7 @@ FROM python:3-slim-bullseye RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/Dockerfile b/Dockerfile index ee12e68..814aac2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install ansible From d157d00f9b2047f916f8aabcea4172e723d82579 Mon Sep 17 00:00:00 2001 From: JeanneD4RK Date: Sun, 16 Jul 2023 22:33:04 +0200 Subject: [PATCH 2/3] Added pywinrm (issue #7) --- 1.9/Dockerfile | 2 +- 2.0/Dockerfile | 2 +- 2.1/Dockerfile | 2 +- 2.10/Dockerfile | 2 +- 2.2/Dockerfile | 2 +- 2.3/Dockerfile | 2 +- 2.4/Dockerfile | 2 +- 2.5/Dockerfile | 2 +- 2.6/Dockerfile | 2 +- 2.7/Dockerfile | 2 +- 2.8/Dockerfile | 2 +- 4.0/Dockerfile | 2 +- 4.5/Dockerfile | 2 +- 6.0/Dockerfile | 2 +- 7.3/Dockerfile | 2 +- Dockerfile | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/1.9/Dockerfile b/1.9/Dockerfile index 4d9c5d9..fa9394a 100644 --- a/1.9/Dockerfile +++ b/1.9/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible~=1.9.0 dnspython + pip install pywinrm ansible~=1.9.0 dnspython diff --git a/2.0/Dockerfile b/2.0/Dockerfile index 81a5acb..91c4755 100644 --- a/2.0/Dockerfile +++ b/2.0/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible~=2.0.0 dnspython + pip install pywinrm ansible~=2.0.0 dnspython diff --git a/2.1/Dockerfile b/2.1/Dockerfile index c99f3fd..b8ece87 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass &&\ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible~=2.1.0 dnspython + pip install pywinrm ansible~=2.1.0 dnspython diff --git a/2.10/Dockerfile b/2.10/Dockerfile index 21af61a..b583495 100644 --- a/2.10/Dockerfile +++ b/2.10/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible~=2.10 paramiko + pip install pywinrm ansible~=2.10 paramiko diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 5758316..430755a 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible~=2.2.0 dnspython + pip install pywinrm ansible~=2.2.0 dnspython diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 4211aac..3301109 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible~=2.3.0 dnspython + pip install pywinrm ansible~=2.3.0 dnspython diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 61cb12a..374a37e 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible~=2.4.0 dnspython + pip install pywinrm ansible~=2.4.0 dnspython diff --git a/2.5/Dockerfile b/2.5/Dockerfile index b7888b6..b87fd35 100644 --- a/2.5/Dockerfile +++ b/2.5/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible~=2.5.0 dnspython + pip install pywinrm ansible~=2.5.0 dnspython diff --git a/2.6/Dockerfile b/2.6/Dockerfile index 5a99455..b569eec 100644 --- a/2.6/Dockerfile +++ b/2.6/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible~=2.6.0 dnspython + pip install pywinrm ansible~=2.6.0 dnspython diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 4121d20..e81f544 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible~=2.7.0 dnspython + pip install pywinrm ansible~=2.7.0 dnspython diff --git a/2.8/Dockerfile b/2.8/Dockerfile index d5b81b7..458f4c9 100644 --- a/2.8/Dockerfile +++ b/2.8/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible~=2.8.0 dnspython boto3==1.12.12 botocore==1.15.12 + pip install pywinrm ansible~=2.8.0 dnspython boto3==1.12.12 botocore==1.15.12 diff --git a/4.0/Dockerfile b/4.0/Dockerfile index bd4190e..f0b9456 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -5,4 +5,4 @@ RUN apt-get update -qq && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN pip install ansible~=4.0.0 paramiko +RUN pip install pywinrm ansible~=4.0.0 paramiko diff --git a/4.5/Dockerfile b/4.5/Dockerfile index 53531b5..dacb330 100644 --- a/4.5/Dockerfile +++ b/4.5/Dockerfile @@ -5,4 +5,4 @@ RUN apt-get update -qq && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN pip install ansible~=4.5.0 paramiko +RUN pip install pywinrm ansible~=4.5.0 paramiko diff --git a/6.0/Dockerfile b/6.0/Dockerfile index 450c5e7..6a769e1 100644 --- a/6.0/Dockerfile +++ b/6.0/Dockerfile @@ -5,4 +5,4 @@ RUN apt-get update -qq && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN pip install ansible~=6.0.0 paramiko +RUN pip install pywinrm ansible~=6.0.0 paramiko diff --git a/7.3/Dockerfile b/7.3/Dockerfile index d4b4203..0ead4c8 100644 --- a/7.3/Dockerfile +++ b/7.3/Dockerfile @@ -5,4 +5,4 @@ RUN apt-get update -qq && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN pip install ansible~=7.3.0 paramiko +RUN pip install pywinrm ansible~=7.3.0 paramiko diff --git a/Dockerfile b/Dockerfile index 814aac2..dc4ea13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip install ansible + pip install pywinrm ansible From 2d7018562a17a9c7900df6a632795d6fa91c0460 Mon Sep 17 00:00:00 2001 From: JeanneD4RK Date: Sun, 16 Jul 2023 22:34:00 +0200 Subject: [PATCH 3/3] Removed duplicate sshpass --- 2.7/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2.7/Dockerfile b/2.7/Dockerfile index e81f544..db08328 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass sshpass && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y vim sshpass && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ pip install pywinrm ansible~=2.7.0 dnspython