diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-14 13:10:54 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-14 13:10:54 -0700 |
| commit | d7ec5e18cebc3d7fcfbc1a187b7407bf9f4ba38a (patch) | |
| tree | 2a261657f3bf88314e00978fb6a42b94b1a7c32a /templates/tools | |
| parent | ff08f33e094640caf8e8ce5d8d2a2f82c3cc4f3b (diff) | |
| parent | f3d71d21b9d115d8e4fdbe29f019918af09c7b13 (diff) | |
Merge remote-tracking branch 'upstream/master' into service_config
Diffstat (limited to 'templates/tools')
| -rw-r--r-- | templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template index b6a3b0d5d2..5c38e9a0e9 100644 --- a/templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template @@ -41,6 +41,12 @@ 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 ${openssl_fallback.base_uri + openssl_fallback.tarball} ENV POST_GIT_STEP tools/dockerfile/test/cxx_wheezy_x64/post-git-setup.sh |