Merge pull request #4458 from edx/pwnage101/better-build-jenkins-dockerfile

improve build jenkins dockerfile

docker/build/jenkins_build/Dockerfile

@@ -6,7 +6,13 @@ RUN apt-get update
 
 ADD . /edx/app/edx_ansible/edx_ansible
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
-COPY docker/build/tools_jenkins/ansible_overrides.yml /
-RUN PYTHONUNBUFFERED=1 /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook -v jenkins_build.yml -i '127.0.0.1,' -c local -e@/ansible_overrides.yml -vv -t 'install'
+COPY docker/build/jenkins_build/ansible_overrides.yml /
+RUN PYTHONUNBUFFERED=1 /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook \
+    -v jenkins_build.yml \
+    -i '127.0.0.1,' \
+    -c local \
+    -e@/ansible_overrides.yml \
+    -t 'install' \
+    -vv
 
 CMD /bin/su -l jenkins --shell=/bin/bash -c "/usr/bin/daemon -f --name=jenkins --inherit --env=JENKINS_HOME=/edx/var/jenkins --output=/var/log/jenkins/jenkins.log --pidfile=/var/run/jenkins/jenkins.pid -- /usr/bin/java  -jar /usr/share/jenkins/jenkins.war --webroot=/var/cache/jenkins/war --httpPort=8080 --ajp13Port=-1"

docker/build/jenkins_build/ansible_overrides.yml

 ---
-DOCKER_TLD: "edx"
+# This docker image for build jenkins is currently intended for local
+# development, or as a base for the community, so we leave out github oauth and
+# add the seed job creator.
+build_jenkins_configuration_scripts:
+  - 1addJarsToClasspath.groovy
+  - 2checkInstalledPlugins.groovy
+  - 3importCredentials.groovy
+  - 3mainConfiguration.groovy
+  - 3setGlobalProperties.groovy
+  - 3shutdownCLI.groovy
+  - 4configureEc2Plugin.groovy
+#  - 4configureGHOAuth.groovy  # intentionally left commented out
+  - 4configureGHPRB.groovy
+  - 4configureGit.groovy
+  - 4configureGithub.groovy
+  - 4configureHipChat.groovy
+  - 4configureJobConfigHistory.groovy
+  - 4configureMailerPlugin.groovy
+  - 4configureMaskPasswords.groovy
+  - 5addSeedJob.groovy  # added this
+  - 5createLoggers.groovy
+
+
+jenkins_common_non_plugin_template_files:
+  - credentials
+  - ec2_config
+  - ghprb_config
+  - git_config
+  - github_config
+  - hipchat_config
+  - job_config_history
+  - log_config
+  - mailer_config
+  - main_config
+  - mask_passwords_config
+  - properties_config
+#  - security  # intentionally left commented out
+  - seed_config