зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1177190: Update libcurl in docker images. r=selena
libcurl shipped with CentOS 6 doesn't support keepalive. This is causing builds to burn. --HG-- extra : commitid : 9uFaPdBg2DL extra : rebase_source : 1e94ef529697818a9a74f0c47b31dfdbaddc31f8
This commit is contained in:
Родитель
d9f0f9bfd5
Коммит
79cc5b1016
|
@ -15,10 +15,11 @@ RUN yum install -y epel-release && \
|
|||
autoconf213 \
|
||||
bc \
|
||||
bison \
|
||||
bzip2 \
|
||||
ccache \
|
||||
curl \
|
||||
curl-devel \
|
||||
libcurl-devel \
|
||||
bzip2 \
|
||||
ccache \
|
||||
dbus-devel \
|
||||
dbus-glib-devel \
|
||||
dbus-glib-devel \
|
||||
|
@ -41,7 +42,6 @@ RUN yum install -y epel-release && \
|
|||
libX11-devel.i686 \
|
||||
libXrandr.i686 \
|
||||
libXt-devel \
|
||||
libcurl-devel \
|
||||
libnotify-devel \
|
||||
libstdc++-static \
|
||||
libstdc++-static \
|
||||
|
@ -85,9 +85,6 @@ RUN yum install -y epel-release && \
|
|||
# distributing them to workers is wasteful.
|
||||
yum clean all
|
||||
|
||||
RUN mkdir -p /home/worker/bin
|
||||
COPY bin/repository-url.py /home/worker/bin/repository-url.py
|
||||
|
||||
# Default to mozilla specific python, etc...
|
||||
ENV PATH /tools/python27-mercurial/bin:/tools/python27/bin:$PATH
|
||||
ENV PATH /tools/tools/buildfarm/utils:$PATH:/home/worker/bin/
|
||||
|
@ -96,11 +93,29 @@ ENV PATH /tools/gcc-4.7.3-0moz1/bin:$PATH
|
|||
# Use the libstd++ we installed over all others...
|
||||
env LD_LIBRARY_PATH=/tools/gcc-4.7.3-0moz1/lib64:/tools/gcc-4.7.3-0moz1/lib
|
||||
|
||||
RUN useradd -d /home/worker -s /bin/bash -m worker
|
||||
|
||||
# Terrible symlink hacks so cc points to the gcc version we intend to use...
|
||||
RUN ls -lah /tools/gcc-4.7.3-0moz1/bin && ln -s /tools/gcc-4.7.3-0moz1/bin/gcc /tools/gcc-4.7.3-0moz1/bin/cc
|
||||
|
||||
RUN useradd -d /home/worker -s /bin/bash -m worker
|
||||
|
||||
RUN mkdir -p /home/worker/bin
|
||||
COPY bin/repository-url.py /home/worker/bin/repository-url.py
|
||||
|
||||
# Install curl
|
||||
RUN mkdir -p /tmp/curl && \
|
||||
cd /tmp/curl && \
|
||||
wget --no-check-certificate https://github.com/bagder/curl/releases/download/curl-7_43_0/curl-7.43.0.tar.gz && \
|
||||
tar -xzf curl-*.tar.gz && \
|
||||
rm -f curl-*.tar.gz && \
|
||||
cd curl-* && \
|
||||
./configure --prefix=/usr --libdir=/usr/lib64 && \
|
||||
make && \
|
||||
make install && \
|
||||
cd .. && \
|
||||
rm -rf curl-* && \
|
||||
cd /home/worker
|
||||
|
||||
|
||||
# Terrible Hack to correctly install git-2.4.1
|
||||
RUN mkdir -p /tmp/git && cd /tmp/git && \
|
||||
curl -L https://s3-us-west-2.amazonaws.com/test-caching/git-2.4.1.tar.gz | tar -xz && \
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.2.8
|
||||
0.2.9
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM quay.io/mozilla/b2g-build:0.2.8
|
||||
FROM quay.io/mozilla/b2g-build:0.2.9
|
||||
MAINTAINER Dustin J. Mitchell <dustin@mozilla.com>
|
||||
|
||||
ENV PYTHONPATH /tools/tools/lib/python:$PYTHONPATH
|
||||
|
@ -21,7 +21,7 @@ RUN git config --global user.email "mozilla@example.com" && \
|
|||
git config --global user.name "mozilla"
|
||||
|
||||
# VCS Tools
|
||||
RUN npm install -g taskcluster-vcs@2.3.5
|
||||
RUN npm install -g taskcluster-vcs@2.3.6
|
||||
|
||||
# TODO enable worker
|
||||
# TODO volume mount permissions will be an issue
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.5.5
|
||||
0.5.6
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM quay.io/mozilla/builder:0.5.5
|
||||
FROM taskcluster/builder:0.5.6
|
||||
MAINTAINER Wander Lairson Costa <wcosta@mozilla.com>
|
||||
|
||||
ENV SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE /home/worker/socorro.token
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.0.15
|
||||
0.0.16
|
||||
|
|
Загрузка…
Ссылка в новой задаче