aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools/dockerfile/test
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-03-21 07:08:50 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-03-21 07:08:50 -0700
commit3448887c901aab0db2b44b73f7840ed5b30b3c7d (patch)
tree43cae1a2fbfa7513e15f0b6896802e8735ea0769 /templates/tools/dockerfile/test
parent6c59e1682606b47651b21977481e762a3b88f028 (diff)
parentddd4d7f10f58bded28b47f09938780633c71fcaa (diff)
Merge github.com:grpc/grpc into filter-selection
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
-rw-r--r--templates/tools/dockerfile/test/sanity/Dockerfile.template8
3 files changed, 15 insertions, 10 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
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template
index ad1d92e7cb..8265c09afc 100644
--- a/templates/tools/dockerfile/test/sanity/Dockerfile.template
+++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template
@@ -34,7 +34,13 @@
<%include file="../../apt_get_basic.include"/>
#========================
# 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
#===================