diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-18 16:41:16 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-18 16:41:16 -0700 |
| commit | dc6d5a6244232555c2d3392d51c65d11b3f447e8 (patch) | |
| tree | aa14e41ce3168b64af9805ac165d611df05ab7fe /templates/tools/dockerfile/test | |
| parent | 8090150911d508d3b861f25d124b7b48462ad8d2 (diff) | |
| parent | 38da4491cc85710ff2870f980cc4389b1fc0ffb0 (diff) | |
Merge pull request #5829 from jtattermusch/fix_openssl_deadlink
Fix gcc4.4 tests
Diffstat (limited to 'templates/tools/dockerfile/test')
| -rw-r--r-- | templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template (renamed from templates/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template) | 17 | ||||
| -rw-r--r-- | templates/tools/dockerfile/test/cxx_wheezy_x64/post-git-setup.sh.template (renamed from templates/tools/dockerfile/test/cxx_squeeze_x64/post-git-setup.sh.template) | 0 |
2 files changed, 8 insertions, 9 deletions
diff --git a/templates/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template index 49371aaa3b..7956798781 100644 --- a/templates/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template @@ -29,20 +29,19 @@ # (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 - <%include file="../../apt_get_basic.include" args="skip_golang=True"/> + <%include file="../../apt_get_basic.include"/> + <%include file="../../cxx_deps.include"/> - # 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 ${openssl_fallback.base_uri + openssl_fallback.tarball} - 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 - <%include file="../../run_tests_addons.include" args="skip_zookeeper=True"/> + <%include file="../../run_tests_addons.include"/> # Define the default command. CMD ["bash"] diff --git a/templates/tools/dockerfile/test/cxx_squeeze_x64/post-git-setup.sh.template b/templates/tools/dockerfile/test/cxx_wheezy_x64/post-git-setup.sh.template index b885101748..b885101748 100644 --- a/templates/tools/dockerfile/test/cxx_squeeze_x64/post-git-setup.sh.template +++ b/templates/tools/dockerfile/test/cxx_wheezy_x64/post-git-setup.sh.template |