Commit 5d0236ca by Michael Roytman Committed by GitHub

Merge pull request #3871 from edx/feanil/tools-jenkins-docker-capabilities

Install docker on tools jenkins.
parents 60e8d50d 8de45d7c
FROM edxops/trusty-common:latest FROM edxops/xenial-common:latest
MAINTAINER edxops MAINTAINER edxops
USER root USER root
......
...@@ -77,3 +77,5 @@ jenkins_tools_debian_pkgs: ...@@ -77,3 +77,5 @@ jenkins_tools_debian_pkgs:
- python-pycurl - python-pycurl
- psmisc - psmisc
- mysql-client-core-5.6 - mysql-client-core-5.6
JENKINS_TOOLS_DOCKER_USER: 'jenkins-docker-proxy'
...@@ -9,4 +9,12 @@ dependencies: ...@@ -9,4 +9,12 @@ dependencies:
jenkins_deb_url: "https://pkg.jenkins.io/debian-stable/binary/jenkins_{{ jenkins_version }}_all.deb" jenkins_deb_url: "https://pkg.jenkins.io/debian-stable/binary/jenkins_{{ jenkins_version }}_all.deb"
jenkins_custom_plugins: [] jenkins_custom_plugins: []
jenkins_bundled_plugins: "{{ jenkins_tools_bundled_plugins }}" jenkins_bundled_plugins: "{{ jenkins_tools_bundled_plugins }}"
jenkins_debian_pkgs: "{{ jenkins_tools_debian_pkgs }}" jenkins_debian_pkgs: "{{ jenkins_tools_debian_pkgs }}"
\ No newline at end of file
# 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 }}'
...@@ -19,3 +19,15 @@ ...@@ -19,3 +19,15 @@
tags: tags:
- install - install
- install:system-requirements - 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
{{ jenkins_user }} ALL=({{ JENKINS_TOOLS_DOCKER_USER }}) SETENV:NOPASSWD:/usr/bin/docker
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment