зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1280178 - Update desktop-test images to node 5.0.0. r=dustin
MozReview-Commit-ID: EjCzi8eVZM8 --HG-- extra : rebase_source : f85458c589fce9c87ae6a142d48d30734a7ac174
This commit is contained in:
Родитель
d7dcc1d4c7
Коммит
bf970a5f64
|
@ -1,4 +1,4 @@
|
||||||
FROM taskcluster/ubuntu1204-test-upd:0.1.9.20160329211700
|
FROM taskcluster/ubuntu1204-test-upd:0.1.11.20160628204600
|
||||||
MAINTAINER Jonas Finnemann Jensen <jopsen@gmail.com>
|
MAINTAINER Jonas Finnemann Jensen <jopsen@gmail.com>
|
||||||
|
|
||||||
# Add utilities and configuration
|
# Add utilities and configuration
|
||||||
|
@ -24,9 +24,8 @@ RUN usermod -a -G video worker
|
||||||
|
|
||||||
RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts
|
RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts
|
||||||
|
|
||||||
# install a new enough npm, plus tc-vcs and tc-npm-cache
|
# install tc-vcs and tc-npm-cache
|
||||||
RUN npm install -g npm@^2.0.0 \
|
RUN npm install -g taskcluster-vcs@2.3.12 \
|
||||||
&& npm install -g taskcluster-vcs@2.3.12 \
|
|
||||||
&& npm install -g taskcluster-npm-cache@1.1.14 \
|
&& npm install -g taskcluster-npm-cache@1.1.14 \
|
||||||
&& rm -rf ~/.npm
|
&& rm -rf ~/.npm
|
||||||
ENV PATH $PATH:/home/worker/bin
|
ENV PATH $PATH:/home/worker/bin
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM taskcluster/ubuntu1204-test:0.1.9
|
FROM taskcluster/ubuntu1204-test:0.1.11
|
||||||
MAINTAINER Dustin J. Mitchell <dustin@mozilla.com>
|
MAINTAINER Dustin J. Mitchell <dustin@mozilla.com>
|
||||||
|
|
||||||
### update to latest from upstream repositories
|
### update to latest from upstream repositories
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
0.1.9.20160329211700
|
0.1.11.20160628204600
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
0.1.9
|
0.1.11
|
||||||
|
|
|
@ -161,18 +161,9 @@ EOF
|
||||||
peep install -r requirements.txt
|
peep install -r requirements.txt
|
||||||
|
|
||||||
# Install node
|
# Install node
|
||||||
tooltool_fetch <<'EOF'
|
wget https://nodejs.org/dist/v5.0.0/node-v5.0.0-linux-x64.tar.gz
|
||||||
[
|
echo 'ef73b59048a0ed11d01633f0061627b7a9879257deb9add2255e4d0808f8b671 node-v5.0.0-linux-x64.tar.gz' | sha256sum -c
|
||||||
{
|
tar -C /usr/local -xz --strip-components 1 < node-v5.0.0-linux-x64.tar.gz
|
||||||
"size": 5676610,
|
|
||||||
"digest": "ce27b788dfd141a5ba7674332825fc136fe2c4f49a319dd19b3a87c8fffa7a97d86cbb8535661c9a68c9122719aa969fc6a8c886458a0df9fc822eec99ed130b",
|
|
||||||
"algorithm": "sha512",
|
|
||||||
"filename": "node-v0.10.36-linux-x64.tar.gz"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
|
|
||||||
EOF
|
|
||||||
tar -C /usr/local -xz --strip-components 1 < node-*.tar.gz
|
|
||||||
node -v # verify
|
node -v # verify
|
||||||
|
|
||||||
# Install custom-built Debian packages. These come from a set of repositories
|
# Install custom-built Debian packages. These come from a set of repositories
|
||||||
|
@ -267,6 +258,13 @@ mesa_version=$(dpkg-query -s libgl1-mesa-dri-lts-saucy | grep ^Version | awk '{
|
||||||
cp sources.list.orig /etc/apt/sources.list
|
cp sources.list.orig /etc/apt/sources.list
|
||||||
apt-get update
|
apt-get update
|
||||||
|
|
||||||
|
# node 5 requires a C++11 compiler.
|
||||||
|
add-apt-repository ppa:ubuntu-toolchain-r/test
|
||||||
|
apt-get update
|
||||||
|
apt-get -y install gcc-4.8 g++-4.8
|
||||||
|
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8
|
||||||
|
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.6 10 --slave /usr/bin/g++ g++ /usr/bin/g++-4.6
|
||||||
|
|
||||||
# clean up
|
# clean up
|
||||||
apt_packages+=('mesa-common-dev')
|
apt_packages+=('mesa-common-dev')
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче