Bug 1218542 - Install language-pack-en-base in ubuntu1204-test image; set LANG/LC_ALL to en_US.UTF-8, r=dustin
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 28 Oct 2015 14:55:10 -0400
changeset 270935 b083ca57314ae0a7448e08ee8ebbb60ba7580171
parent 270934 0b174a1227c70b70e1668ae94b5f96bd54abd04f
child 270936 4b3c08886ba972a7b6f5429a497aba87bbd23d46
push id86
push usercbook@mozilla.com
push dateWed, 04 Nov 2015 14:00:24 +0000
reviewersdustin
bugs1218542
milestone45.0a1
Bug 1218542 - Install language-pack-en-base in ubuntu1204-test image; set LANG/LC_ALL to en_US.UTF-8, r=dustin Also calls `dpkg-reconfigure locales`, but it's not entirely clear if this is necessary or not.
testing/docker/desktop-test/Dockerfile
testing/docker/desktop-test/VERSION
testing/docker/ubuntu1204-test-upd/Dockerfile
testing/docker/ubuntu1204-test-upd/VERSION
testing/docker/ubuntu1204-test/Dockerfile
testing/docker/ubuntu1204-test/VERSION
testing/docker/ubuntu1204-test/system-setup.sh
--- a/testing/docker/desktop-test/Dockerfile
+++ b/testing/docker/desktop-test/Dockerfile
@@ -1,9 +1,9 @@
-FROM          taskcluster/ubuntu1204-test-upd:0.1.1.20151012044301
+FROM          taskcluster/ubuntu1204-test-upd:0.1.2.20151102105912
 MAINTAINER    Jonas Finnemann Jensen <jopsen@gmail.com>
 
 # Add utilities and configuration
 COPY           dot-config                    /home/worker/.config
 COPY           dot-pulse                     /home/worker/.pulse
 COPY           bin                           /home/worker/bin
 # TODO: remove this when buildbot is gone
 COPY           buildprops.json               /home/worker/buildprops.json
--- a/testing/docker/desktop-test/VERSION
+++ b/testing/docker/desktop-test/VERSION
@@ -1,1 +1,1 @@
-0.4.3
+0.4.4
--- a/testing/docker/ubuntu1204-test-upd/Dockerfile
+++ b/testing/docker/ubuntu1204-test-upd/Dockerfile
@@ -1,9 +1,9 @@
-FROM          taskcluster/ubuntu1204-test:0.1.1
+FROM          taskcluster/ubuntu1204-test:0.1.2
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 ### update to latest from upstream repositories
 # if this becomes a long list of packages, consider bumping the
 # ubunt1204-test version
 RUN apt-get update && apt-get upgrade -y --force-yes
 
 # Set a default command useful for debugging
--- a/testing/docker/ubuntu1204-test-upd/VERSION
+++ b/testing/docker/ubuntu1204-test-upd/VERSION
@@ -1,1 +1,1 @@
-0.1.1.20151012044301
+0.1.2.20151102105912
--- a/testing/docker/ubuntu1204-test/Dockerfile
+++ b/testing/docker/ubuntu1204-test/Dockerfile
@@ -10,11 +10,13 @@ RUN           bash /tmp/system-setup.sh
 
 # Set variable normally configured at login, by the shells parent process, these
 # are taken from GNU su manual
 ENV           HOME          /home/worker
 ENV           SHELL         /bin/bash
 ENV           USER          worker
 ENV           LOGNAME       worker
 ENV           HOSTNAME      taskcluster-worker
+ENV           LANG          en_US.UTF-8
+ENV           LC_ALL        en_US.UTF-8
 
 # Set a default command useful for debugging
 CMD ["/bin/bash", "--login"]
--- a/testing/docker/ubuntu1204-test/VERSION
+++ b/testing/docker/ubuntu1204-test/VERSION
@@ -1,1 +1,1 @@
-0.1.1
+0.1.2
--- a/testing/docker/ubuntu1204-test/system-setup.sh
+++ b/testing/docker/ubuntu1204-test/system-setup.sh
@@ -33,16 +33,17 @@ apt_packages+=('gir1.2-gnomebluetooth-1.
 apt_packages+=('git')
 apt_packages+=('gstreamer0.10-alsa')
 apt_packages+=('gstreamer0.10-ffmpeg')
 apt_packages+=('gstreamer0.10-plugins-bad')
 apt_packages+=('gstreamer0.10-plugins-base')
 apt_packages+=('gstreamer0.10-plugins-good')
 apt_packages+=('gstreamer0.10-plugins-ugly')
 apt_packages+=('gstreamer0.10-tools')
+apt_packages+=('language-pack-en-base')
 apt_packages+=('libasound2-dev')
 apt_packages+=('libasound2-plugins:i386')
 apt_packages+=('libcanberra-pulse')
 apt_packages+=('libcurl4-openssl-dev')
 apt_packages+=('libdbus-1-dev')
 apt_packages+=('libdbus-glib-1-dev')
 apt_packages+=('libdrm-intel1:i386')
 apt_packages+=('libdrm-nouveau1a:i386')
@@ -119,16 +120,18 @@ apt_packages+=('x11-xserver-utils')
 
 # use Ubuntu's Python-2.7 (2.7.3 on Precise)
 apt_packages+=('python-dev')
 apt_packages+=('python-pip')
 
 apt-get update
 apt-get install -y --force-yes ${apt_packages[@]}
 
+dpkg-reconfigure locales
+
 # set up tooltool (temporarily)
 curl https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py > /setup/tooltool.py
 tooltool_fetch() {
     cat >manifest.tt
     python /setup/tooltool.py fetch
     rm manifest.tt
 }