Bug 1289249 - Remove centos6-build image; r?dustin
The system-setup.sh script has been moved to the "desktop-build.sh"
recipe and included in each of the Dockerfiles that referenced it.
The remaining lines from centos6-build's Dockerfile have
essentially been inlined into the Dockerfiles that previously inherited
from centos6-build.
As of this change, we no longer require someone with TaskCluster
privileges to upload a base image to the Docker Registry: it is
possible to make changes to the environment used to build Firefox
in-tree. You can easily experiment with new build environments by
pushing to Try.
MozReview-Commit-ID: 8zXHoPlCVkP
--- a/testing/docker/android-gradle-build/Dockerfile
+++ b/testing/docker/android-gradle-build/Dockerfile
@@ -1,11 +1,17 @@
-FROM taskcluster/centos6-build:0.1.7
+FROM centos:6
MAINTAINER Nick Alexander <nalexander@mozilla.com>
+RUN useradd -d /home/worker -s /bin/bash -m worker
+
+# %include testing/docker/recipes/desktop-build.sh
+ADD topsrcdir/testing/docker/recipes/desktop-build.sh /tmp/system-setup.sh
+RUN bash /tmp/system-setup.sh
+
# BEGIN ../desktop-build/Dockerfile
# Add build scripts; these are the entry points from the taskcluster worker, and
# operate on environment variables
ADD bin /home/worker/bin
RUN chmod +x /home/worker/bin/*
# Generate machine uuid file
@@ -70,10 +76,10 @@ RUN tar zxf nexus-${NEXUS_VERSION}-bundl
&& rm -rf /tmp/nexus-${NEXUS_VERSION} \
&& rm -rf /tmp/nexus-${NEXUS_VERSION}-bundle.tar.gz
# Install tooltool directly from github.
RUN mkdir /build
ADD https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py /build/tooltool.py
RUN chmod +rx /build/tooltool.py
-# Back to the centos6-build workdir, matching desktop-build.
+# To match desktop-build.
WORKDIR /home/worker
deleted file mode 100644
--- a/testing/docker/centos6-build/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM centos:6
-MAINTAINER Dustin J. Mitchell <dustin@mozilla.com>
-
-### add worker user and setup its workspace
-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
-
-# Set a default command useful for debugging
-CMD ["/bin/bash", "--login"]
deleted file mode 100644
--- a/testing/docker/centos6-build/REGISTRY
+++ /dev/null
@@ -1,1 +0,0 @@
-taskcluster
deleted file mode 100644
--- a/testing/docker/centos6-build/VERSION
+++ /dev/null
@@ -1,1 +0,0 @@
-0.1.7
--- a/testing/docker/desktop-build/Dockerfile
+++ b/testing/docker/desktop-build/Dockerfile
@@ -1,11 +1,18 @@
-FROM taskcluster/centos6-build:0.1.7
+FROM centos:6
MAINTAINER Dustin J. Mitchell <dustin@mozilla.com>
+RUN useradd -d /home/worker -s /bin/bash -m worker
+WORKDIR /home/worker
+
+# %include testing/docker/recipes/desktop-build.sh
+ADD topsrcdir/testing/docker/recipes/desktop-build.sh /tmp/system-setup.sh
+RUN bash /tmp/system-setup.sh
+
# Add build scripts; these are the entry points from the taskcluster worker, and
# operate on environment variables
ADD bin /home/worker/bin
RUN chmod +x /home/worker/bin/*
# Add configuration
COPY dot-config /home/worker/.config
--- a/testing/docker/desktop-l10n/Dockerfile
+++ b/testing/docker/desktop-l10n/Dockerfile
@@ -1,11 +1,18 @@
-FROM taskcluster/centos6-build:0.1.7
+FROM centos:6
MAINTAINER Varun Joshi <varunj.1011@gmail.com>
+RUN useradd -d /home/worker -s /bin/bash -m worker
+WORKDIR /home/worker
+
+# %include testing/docker/recipes/desktop-build.sh
+ADD topsrcdir/testing/docker/recipes/desktop-build.sh /tmp/system-setup.sh
+RUN bash /tmp/system-setup.sh
+
ADD bin /home/worker/bin
ADD .hgrc /home/worker/.hgrc
RUN chmod +x /home/worker/bin/*
# Generate machine uuid file (like how desktop-build does)
RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id
ADD oauth.txt /home/worker
rename from testing/docker/centos6-build/system-setup.sh
rename to testing/docker/recipes/desktop-build.sh