diff options
author | Vijay Pai <vpai@google.com> | 2016-03-19 05:50:34 -0700 |
---|---|---|
committer | Vijay Pai <vpai@google.com> | 2016-03-19 05:50:34 -0700 |
commit | f637ce5a0a6fbdc6d0cc747d4dfd6dec2fb7531a (patch) | |
tree | b9997134767deef7ec49fa54cd4c6c2795733d49 /tools/dockerfile | |
parent | 5bda4d46d168a764ef5ea69e7527fec65a7e473f (diff) | |
parent | cb1c389a6c98d72e59fe10e07f4c15156abf62a1 (diff) |
Merge branch 'master' into make_clang_great_again_v2
Diffstat (limited to 'tools/dockerfile')
-rw-r--r-- | tools/dockerfile/test/cxx_wheezy_x64/Dockerfile (renamed from tools/dockerfile/test/cxx_squeeze_x64/Dockerfile) | 21 | ||||
-rwxr-xr-x | tools/dockerfile/test/cxx_wheezy_x64/post-git-setup.sh (renamed from tools/dockerfile/test/cxx_squeeze_x64/post-git-setup.sh) | 0 | ||||
-rw-r--r-- | tools/dockerfile/test/sanity/Dockerfile | 8 |
3 files changed, 21 insertions, 8 deletions
diff --git a/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile b/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile index b7f95aaa8d..6f330f9166 100644 --- a/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM debian:squeeze +FROM debian:wheezy # Install Git and basic packages. RUN apt-get update && apt-get install -y \ @@ -40,6 +40,7 @@ RUN apt-get update && apt-get install -y \ gcc \ gcc-multilib \ git \ + golang \ gyp \ lcov \ libc6 \ @@ -62,16 +63,18 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean +#================= +# C++ dependencies +RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean -# libgflags-dev is not available on squeezy -RUN apt-get update && apt-get -y install libgtest-dev libc++-dev clang && apt-get clean -RUN apt-get update && apt-get -y install python-pip && apt-get clean -RUN pip install argparse +RUN apt-get update && apt-get install -y \ + gcc-4.4 \ + gcc-4.4-multilib -RUN wget http://openssl.org/source/openssl-1.0.2f.tar.gz +RUN wget https://openssl.org/source/old/1.0.2/openssl-1.0.2f.tar.gz -ENV POST_GIT_STEP tools/dockerfile/test/cxx_squeeze_x64/post-git-setup.sh +ENV POST_GIT_STEP tools/dockerfile/test/cxx_wheezy_x64/post-git-setup.sh # Prepare ccache RUN ln -s /usr/bin/ccache /usr/local/bin/gcc @@ -81,6 +84,10 @@ RUN ln -s /usr/bin/ccache /usr/local/bin/c++ RUN ln -s /usr/bin/ccache /usr/local/bin/clang RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ +#====================== +# Zookeeper dependencies +# TODO(jtattermusch): is zookeeper still needed? +RUN apt-get install -y libzookeeper-mt-dev RUN mkdir /var/local/jenkins diff --git a/tools/dockerfile/test/cxx_squeeze_x64/post-git-setup.sh b/tools/dockerfile/test/cxx_wheezy_x64/post-git-setup.sh index dfde93b1bd..dfde93b1bd 100755 --- a/tools/dockerfile/test/cxx_squeeze_x64/post-git-setup.sh +++ b/tools/dockerfile/test/cxx_wheezy_x64/post-git-setup.sh diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index 1935f67560..4a69cd8c00 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -65,7 +65,13 @@ RUN apt-get update && apt-get install -y time && apt-get clean #======================== # Sanity test dependencies -RUN apt-get update && apt-get install -y python-pip +RUN apt-get update && apt-get install -y \ + python-pip \ + autoconf \ + automake \ + libtool \ + curl \ + python-virtualenv RUN pip install simplejson mako #=================== |