Bug 1289249 - Inline hgrc into system-setup.sh; r?dustin draft
authorGregory Szorc <gps@mozilla.com>
Mon, 25 Jul 2016 18:58:16 -0700
changeset 392711 c8d658b5018e632d55e9fe7666820e5869a69fb7
parent 392710 e57a856878555d5f88f81edf5af3b86d2ffc03af
child 392712 aa4ddeea11eccdf3a4490f9574c3328146428d2c
push id24096
push usergszorc@mozilla.com
push dateTue, 26 Jul 2016 03:36:17 +0000
reviewersdustin
bugs1289249
milestone50.0a1
Bug 1289249 - Inline hgrc into system-setup.sh; r?dustin Continuing to minimize centos6-build's Dockerfile so we can eliminate the image. MozReview-Commit-ID: 7hju6PS2clV
testing/docker/centos6-build/Dockerfile
testing/docker/centos6-build/hgrc
testing/docker/centos6-build/system-setup.sh
--- a/testing/docker/centos6-build/Dockerfile
+++ b/testing/docker/centos6-build/Dockerfile
@@ -5,14 +5,10 @@ MAINTAINER    Dustin J. Mitchell <dustin
 RUN useradd -d /home/worker -s /bin/bash -m worker
 # Declare default working folder
 WORKDIR       /home/worker
 
 # install non-build specific dependencies in a single layer
 ADD           system-setup.sh   /tmp/system-setup.sh
 RUN           bash /tmp/system-setup.sh
 
-# Builds need the share module enabled
-ADD           hgrc /home/worker/.hgrc
-RUN chown -R worker:worker /home/worker/.hgrc
-
 # Set a default command useful for debugging
 CMD ["/bin/bash", "--login"]
deleted file mode 100644
--- a/testing/docker/centos6-build/hgrc
+++ /dev/null
@@ -1,2 +0,0 @@
-[extensions]
-share =
--- a/testing/docker/centos6-build/system-setup.sh
+++ b/testing/docker/centos6-build/system-setup.sh
@@ -421,16 +421,22 @@ cat >requirements.txt <<'EOF'
 # sha256: 90pZQ6kAXB6Je8-H9-ivfgDAb6l3e5rWkfafn6VKh9g
 virtualenv==13.1.2
 
 # sha256: wJnELXTi1SC2HdNyzZlrD6dgXAZheDT9exPHm5qaWzA
 mercurial==3.7.3
 EOF
 peep install -r requirements.txt
 
+cat >/home/worker/.hgrc << EOF
+[extensions]
+share =
+EOF
+chown worker:worker /home/worker/.hgrc
+
 # TC-VCS
 npm install -g taskcluster-vcs@2.3.18
 
 # Ninja
 cd $BUILD
 tooltool_fetch <<'EOF'
 [
 {