Merge pull request #3960 from edx/mroytman/add-jenkins-user-to-docker

remove docker-proxy-user and add jenkins user to docker group instead

playbooks/roles/tools_jenkins/defaults/main.yml

@@ -77,5 +77,3 @@ jenkins_tools_debian_pkgs:
     - python-pycurl
     - psmisc
     - mysql-client-core-5.6
-
-JENKINS_TOOLS_DOCKER_USER: 'jenkins-docker-proxy'

playbooks/roles/tools_jenkins/meta/main.yml

@@ -12,9 +12,6 @@ dependencies:
     jenkins_debian_pkgs: "{{ jenkins_tools_debian_pkgs }}"
 
   # Needed to be able to build docker images. Used by Docker Image Builder Jobs.
-  - role: user
-    user_info:
-        - name: '{{ JENKINS_TOOLS_DOCKER_USER }}'
   - role: docker-tools
     docker_users:
-        - '{{ JENKINS_TOOLS_DOCKER_USER }}'
+        - '{{ jenkins_user }}'

playbooks/roles/tools_jenkins/tasks/main.yml

@@ -19,15 +19,3 @@
   tags:
     - install
     - install:system-requirements
-
-- name: Create sudoers file from template
-  template:
-    dest: "/etc/sudoers.d/99-tools_jenkins"
-    src: "99-tools-jenkins.j2"
-    owner: "root"
-    group: "root"
-    mode: "0440"
-    validate: 'visudo -cf %s'
-  tags:
-    - install
-    - install:configuration

playbooks/roles/tools_jenkins/templates/99-tools-jenkins.j2

-{{ jenkins_user }} ALL=({{ JENKINS_TOOLS_DOCKER_USER }}) SETENV:NOPASSWD:/usr/bin/docker