aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Matt Kwong <mattkwong@google.com>2016-10-11 13:49:23 -0700
committerGravatar Matt Kwong <mattkwong@google.com>2016-10-11 13:49:23 -0700
commit41c06a2ed563e31add33212dd861f554fc426c2b (patch)
tree778bea12986703f42db8899d5527b2c3e998ecbc /tools
parent8bed8c853fbfe9f10d379b1bd731c2835d50a2c9 (diff)
move changes from dockerfile to template
Diffstat (limited to 'tools')
-rw-r--r--tools/dockerfile/test/cxx_wheezy_x64/Dockerfile12
1 files changed, 5 insertions, 7 deletions
diff --git a/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile b/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile
index 503a435707..f22fcacc13 100644
--- a/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile
@@ -63,13 +63,6 @@ RUN apt-get update && apt-get install -y \
# Build profiling
RUN apt-get update && apt-get install -y time && apt-get clean
-#================
-# Add backport to Debian sources.list and update git to version > 1.7
-RUN echo "deb http://http.debian.net/debian wheezy-backports main" \
- >/etc/apt/sources.list.d/wheezy-backports.list
-RUN apt-get update -qq
-RUN apt-get -t wheezy-backports install -y -qq git mercurial
-
#====================
# Python dependencies
@@ -96,6 +89,11 @@ RUN apt-get update && apt-get install -y \
g++-4.4 \
g++-4.4-multilib
+# set up backport to allow installation of Git version > 1.7
+RUN echo "deb http://http.debian.net/debian wheezy-backports main" >/etc/apt/sources.list.d/wheezy-backports.list
+RUN apt-get update -qq
+RUN apt-get -t wheezy-backports install -qq git
+
RUN wget https://openssl.org/source/old/1.0.2/openssl-1.0.2f.tar.gz
ENV POST_GIT_STEP tools/dockerfile/test/cxx_wheezy_x64/post-git-setup.sh