From 16c7ea351a34753aa9b22ff06145b911569f5bd9 Mon Sep 17 00:00:00 2001 From: Paul Montero Date: Tue, 19 Sep 2017 00:40:08 -0500 Subject: [PATCH] Escalate privileges to test single user installation --- tests/dockerfiles/centos6/Dockerfile | 5 +++-- tests/dockerfiles/centos7/Dockerfile | 5 +++-- tests/dockerfiles/debian8/Dockerfile | 9 +++++---- tests/dockerfiles/debian9/Dockerfile | 5 +++-- tests/dockerfiles/ubuntu14/Dockerfile | 5 +++-- tests/dockerfiles/ubuntu16/Dockerfile | 5 +++-- tests/test_user.yml | 1 + 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/tests/dockerfiles/centos6/Dockerfile b/tests/dockerfiles/centos6/Dockerfile index 1792c95..e067bbd 100644 --- a/tests/dockerfiles/centos6/Dockerfile +++ b/tests/dockerfiles/centos6/Dockerfile @@ -1,11 +1,12 @@ FROM centos:6 -RUN useradd -ms /bin/bash user - RUN yum update -y && \ yum install -y \ initscripts \ sudo \ && yum clean all +RUN useradd -ms /bin/bash user \ + && echo 'user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers + CMD ["/sbin/init"] diff --git a/tests/dockerfiles/centos7/Dockerfile b/tests/dockerfiles/centos7/Dockerfile index 4cc0792..cdb6850 100644 --- a/tests/dockerfiles/centos7/Dockerfile +++ b/tests/dockerfiles/centos7/Dockerfile @@ -1,11 +1,12 @@ FROM centos:7 -RUN useradd -ms /bin/bash user - RUN yum update -y && \ yum install -y \ sudo \ which \ && yum clean all +RUN useradd -ms /bin/bash user \ + && echo 'user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers + CMD ["/usr/sbin/init"] diff --git a/tests/dockerfiles/debian8/Dockerfile b/tests/dockerfiles/debian8/Dockerfile index 5ec183c..e2854bf 100644 --- a/tests/dockerfiles/debian8/Dockerfile +++ b/tests/dockerfiles/debian8/Dockerfile @@ -1,9 +1,7 @@ FROM debian:8 -RUN useradd -ms /bin/bash user - -RUN apt-get update && \ - apt-get install -y \ +RUN apt-get update \ + && apt-get install -y \ curl \ build-essential \ libbz2-dev \ @@ -19,4 +17,7 @@ WORKDIR /opt/ COPY build /opt/build RUN bash build +RUN useradd -ms /bin/bash user \ + && echo 'user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers + CMD ["/sbin/init"] diff --git a/tests/dockerfiles/debian9/Dockerfile b/tests/dockerfiles/debian9/Dockerfile index 4d43447..c4c7312 100644 --- a/tests/dockerfiles/debian9/Dockerfile +++ b/tests/dockerfiles/debian9/Dockerfile @@ -1,7 +1,5 @@ FROM debian:9 -RUN useradd -ms /bin/bash user - RUN apt-get update && \ apt-get install -y \ curl \ @@ -11,4 +9,7 @@ RUN apt-get update && \ systemd \ && rm -rf /var/lib/apt/lists/* +RUN useradd -ms /bin/bash user \ + && echo 'user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers + CMD ["/bin/systemd"] diff --git a/tests/dockerfiles/ubuntu14/Dockerfile b/tests/dockerfiles/ubuntu14/Dockerfile index 5cf3ba2..5121bfd 100644 --- a/tests/dockerfiles/ubuntu14/Dockerfile +++ b/tests/dockerfiles/ubuntu14/Dockerfile @@ -1,7 +1,5 @@ FROM ubuntu:14.04 -RUN useradd -ms /bin/bash user - RUN apt-get update && \ apt-get install -y \ curl \ @@ -19,4 +17,7 @@ WORKDIR /opt/ COPY build /opt/build RUN bash build +RUN useradd -ms /bin/bash user \ + && echo 'user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers + CMD ["/sbin/init"] diff --git a/tests/dockerfiles/ubuntu16/Dockerfile b/tests/dockerfiles/ubuntu16/Dockerfile index 10e923d..c9b6004 100644 --- a/tests/dockerfiles/ubuntu16/Dockerfile +++ b/tests/dockerfiles/ubuntu16/Dockerfile @@ -1,7 +1,5 @@ FROM ubuntu:16.04 -RUN useradd -ms /bin/bash user - RUN apt-get update && \ apt-get install -y \ curl \ @@ -9,4 +7,7 @@ RUN apt-get update && \ sudo \ && rm -rf /var/lib/apt/lists/* +RUN useradd -ms /bin/bash user \ + && echo 'user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers + CMD ["/sbin/init"] diff --git a/tests/test_user.yml b/tests/test_user.yml index e22bd70..05041f8 100644 --- a/tests/test_user.yml +++ b/tests/test_user.yml @@ -9,3 +9,4 @@ - 'ruby-2.3.1' roles: - role: rvm1-ansible + become: yes