[CE-393]Ansible agent container does not allow sudo

ansible agent container does not have sudo installed, when playbooks try to switch to sudo, it fails. This patch set fixed that issue and also removed an unused package from the container to reduce the size of the container. Change-Id: I2250a165c1f675a9a6ca10e20781d89263ee6cc6 Signed-off-by: Tong Li <litong01@us.ibm.com>
hyperledger · Jun 22, 2018 · 589ea4c · 589ea4c
1 parent 5162a2b
commit 589ea4c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/docker/ansible-agent/Dockerfile.in b/docker/ansible-agent/Dockerfile.in
@@ -11,14 +11,15 @@ ARG uid=1000
 ARG gid=1000
 
 RUN apt-get update                                          && \
-    apt-get install -y bash curl python-dev sshpass 	       \
+    apt-get install -y bash curl python-dev sshpass sudo       \
     python-pip build-essential openssh-client libffi-dev       \
-    libssl-dev						    && \
+    libssl-dev                                              && \
     pip install --upgrade pip ansible boto boto3 shade         \
-    pyyaml openshift                                        && \
+    pyyaml                                                  && \
     groupadd -g ${gid} ${user}                              && \
     useradd -d /opt/agent -u ${uid} -g ${user} ${user}      && \
     usermod -a -G root ${user}                              && \
+    echo "${user} ALL=(ALL) NOPASSWD: ALL"|tee /etc/sudoers.d/${user} && \
     mkdir -p /opt/agent/.ssh                                && \
     cd /opt/agent/.ssh                                      && \
     echo "host *" > config                                  && \

diff --git a/dockerhub/latest/ansible-agent/Dockerfile b/dockerhub/latest/ansible-agent/Dockerfile
@@ -19,12 +19,13 @@ ARG uid=1000
 ARG gid=1000
 
 RUN apt-get update                                                 && \
-    apt-get install -y bash sshpass python-pip openssh-client      && \
+    apt-get install -y bash sshpass python-pip openssh-client sudo && \
     pip install --upgrade pip ansible boto boto3 shade                \
-    pyyaml openshift                                               && \
+    pyyaml                                                         && \
     groupadd -g ${gid} ${user}                                     && \
     useradd -d /opt/agent -u ${uid} -g ${user} ${user}             && \
     usermod -a -G root ${user}                                     && \
+    echo "${user} ALL=(ALL) NOPASSWD: ALL"|tee /etc/sudoers.d/${user} && \
     mkdir -p /opt/agent/.ssh                                       && \
     cd /opt/agent/.ssh                                             && \
     echo "host *" > config                                         && \