From b7bac297b1af0c511bd0c7d96c6935876314394c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Heidb=C3=BCchel?= <j.heidbuechel@fz-juelich.de>
Date: Wed, 10 Mar 2021 14:00:17 +0000
Subject: [PATCH] Update Dockerfile, Dockerfile-2.9, Dockerfile.ubuntu,
 requirements-2.9.txt, requirements.txt files

---
 Dockerfile           |  3 ++-
 Dockerfile-2.9       |  3 ++-
 Dockerfile.ubuntu    |  3 ++-
 requirements-2.9.txt | 56 ++++----------------------------------------
 requirements.txt     | 53 +----------------------------------------
 5 files changed, 11 insertions(+), 107 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8dfd99c..659abbf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,10 +19,11 @@ RUN apt-get update && \
       openssh-client \
       openssl \
       qemu-utils && \
+    echo "[libdefaults]\n    rdns=false" > /etc/krb5.conf && \
     curl -fsSL -o /tmp/get-helm \
       https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 &&\
     bash /tmp/get-helm && \
-    helm plugin install https://github.com/databus23/helm-diff && \
+    if test "$(uname -m)" = "x86_64"; then helm plugin install https://github.com/databus23/helm-diff; fi && \
     pip install --no-cache-dir -r /root/requirements.txt && \
     apt-get -yqq remove gcc libffi-dev libkrb5-dev && \
     rm -f /root/requirements.txt /tmp/get-helm && \
diff --git a/Dockerfile-2.9 b/Dockerfile-2.9
index 3996638..6a746d2 100644
--- a/Dockerfile-2.9
+++ b/Dockerfile-2.9
@@ -19,10 +19,11 @@ RUN apt-get update && \
       openssh-client \
       openssl \
       qemu-utils && \
+    echo "[libdefaults]\n    rdns=false" > /etc/krb5.conf && \
     curl -fsSL -o /tmp/get-helm \
       https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 &&\
     bash /tmp/get-helm && \
-    helm plugin install https://github.com/databus23/helm-diff && \
+    if test "$(uname -m)" = "x86_64"; then helm plugin install https://github.com/databus23/helm-diff; fi && \
     pip install --no-cache-dir -r /root/requirements.txt && \
     apt-get -yqq remove gcc libffi-dev libkrb5-dev && \
     rm -f /root/requirements.txt /tmp/get-helm && \
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 728be6f..6e9790d 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -21,10 +21,11 @@ RUN apt-get update && \
       python3 \
       python3-pip \
       qemu-utils && \
+    echo "[libdefaults]\n    rdns=false" > /etc/krb5.conf && \
     curl -fsSL -o /tmp/get-helm \
       https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 &&\
     bash /tmp/get-helm && \
-    helm plugin install https://github.com/databus23/helm-diff && \
+    if test "$(uname -m)" = "x86_64"; then helm plugin install https://github.com/databus23/helm-diff; fi && \
     pip3 install --upgrade pip && \
     pip3 install --no-cache-dir -r /root/requirements.txt && \
     apt-get -yqq remove gcc libffi-dev libkrb5-dev && \
diff --git a/requirements-2.9.txt b/requirements-2.9.txt
index a4bbbca..1ec502e 100644
--- a/requirements-2.9.txt
+++ b/requirements-2.9.txt
@@ -1,56 +1,8 @@
 ansible==2.9.14
-appdirs
-asn1crypto
-autopep8
-bcrypt
-certifi
-cffi
-chardet
-cryptography
-decorator
-deprecation
+ansible-lint
 dnspython
-dogpile.cache
-enum34
-flake8
-idna
-ipaddress
-iso8601
-jedi
-Jinja2
-jmespath
-jsonpatch
-jsonpointer
-kerberos
-MarkupSafe
-mccabe
-munch
-netifaces
-ntlm-auth
 openstacksdk==0.46
-ordereddict
-packaging
-paramiko
-parso
-pbr
 pexpect
-ptyprocess
-pyasn1
-pycodestyle
-pycparser
-pycrypto
-pyflakes
-pykerberos
-PyNaCl
-pyparsing
-python-ntlm3
-pywinrm
-PyYAML
-requests
-requests-kerberos
-requests-ntlm
-requestsexceptions
-six
-stevedore
-urllib3
-xmltodict
+pyhelm
+pywinrm[kerberos]
+urllib3
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index b211e20..b7b0883 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,59 +1,8 @@
-
-Jinja2
-MarkupSafe
-PyNaCl
-PyYAML
 ansible
 ansible-lint
-appdirs
-asn1crypto
-autopep8
-bcrypt
-certifi
-cffi
-chardet
-cryptography
-decorator
-deprecation
 dnspython
-dogpile.cache
-enum34
-flake8
-idna
-ipaddress
-iso8601
-jedi
-jmespath
-jsonpatch
-jsonpointer
-kerberos
-mccabe
-munch
-netifaces
-ntlm-auth
 openstacksdk==0.46
-ordereddict
-packaging
-paramiko
-parso
-pbr
 pexpect
-ptyprocess
-pyasn1
-pycodestyle
-pycparser
-pycrypto
-pyflakes
 pyhelm
-pykerberos
-pyparsing
-python-ntlm3
-pywinrm
-requests
-requests-kerberos
-requests-ntlm
-requestsexceptions
-six
-stevedore
+pywinrm[kerberos]
 urllib3
-xmltodict
-- 
GitLab