switch C# docker images to debian stretch

pull/17309/head
Jan Tattermusch 6 years ago
parent 7ef8fc826c
commit 19bc2c2937
  1. 25
      templates/tools/dockerfile/csharp_deps.include
  2. 26
      templates/tools/dockerfile/csharp_dotnetcli_deps.include
  3. 2
      templates/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile.template
  4. 2
      templates/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile.template
  5. 4
      templates/tools/dockerfile/test/csharp_stretch_x64/Dockerfile.template
  6. 2
      tools/run_tests/run_tests.py

@ -1,24 +1,15 @@
#================ #================
# C# dependencies # C# dependencies
# Update to a newer version of mono # cmake >=3.6 needed to build grpc_csharp_ext
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF RUN apt-get update && apt-get install -y cmake && apt-get clean
RUN echo "deb http://download.mono-project.com/repo/debian jessie main" | tee /etc/apt/sources.list.d/mono-official.list
RUN echo "deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list # Install mono
RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list RUN apt-get update && apt-get install -y apt-transport-https dirmngr && apt-get clean
RUN apt-key adv --no-tty --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
# Install dependencies RUN echo "deb https://download.mono-project.com/repo/debian stable-stretch main" | tee /etc/apt/sources.list.d/mono-official-stable.list
RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y ${'\\'} RUN apt-get update && apt-get install -y ${'\\'}
mono-devel ${'\\'} mono-devel ${'\\'}
ca-certificates-mono ${'\\'} ca-certificates-mono ${'\\'}
nuget ${'\\'} nuget ${'\\'}
&& apt-get clean && apt-get clean
RUN nuget update -self
#=================
# Use cmake 3.6 from jessie-backports
# needed to build grpc_csharp_ext with cmake
RUN echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean

@ -1,12 +1,20 @@
# Install dotnet SDK based on https://www.microsoft.com/net/core#debian # Install dotnet SDK
RUN apt-get update && apt-get install -y curl libunwind8 gettext ENV DOTNET_SDK_VERSION 2.1.500
# dotnet-dev-1.0.0-preview2-003131 RUN curl -sSL -o dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz ${'\\'}
RUN curl -sSL -o dotnet100.tar.gz https://go.microsoft.com/fwlink/?LinkID=827530 && mkdir -p /usr/share/dotnet ${'\\'}
RUN mkdir -p /opt/dotnet && tar zxf dotnet100.tar.gz -C /opt/dotnet && tar -zxf dotnet.tar.gz -C /usr/share/dotnet ${'\\'}
# dotnet-dev-1.0.1 && rm dotnet.tar.gz ${'\\'}
RUN curl -sSL -o dotnet101.tar.gz https://go.microsoft.com/fwlink/?LinkID=843453 && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
RUN mkdir -p /opt/dotnet && tar zxf dotnet101.tar.gz -C /opt/dotnet
RUN ln -s /opt/dotnet/dotnet /usr/local/bin
# Install .NET Core 1.1.10 runtime (required to run netcoreapp1.1)
RUN curl -sSL -o dotnet_old.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Runtime/1.1.10/dotnet-debian.9-x64.1.1.10.tar.gz ${'\\'}
&& mkdir -p dotnet_old ${'\\'}
&& tar zxf dotnet_old.tar.gz -C dotnet_old ${'\\'}
&& cp -r dotnet_old/shared/Microsoft.NETCore.App/1.1.10/ /usr/share/dotnet/shared/Microsoft.NETCore.App/ ${'\\'}
&& rm -rf dotnet_old/ dotnet_old.tar.gz
RUN apt-get update && apt-get install -y libunwind8 && apt-get clean
# Trigger the population of the local package cache # Trigger the population of the local package cache
ENV NUGET_XMLDOC_MODE skip ENV NUGET_XMLDOC_MODE skip

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM debian:jessie FROM debian:stretch
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/> <%include file="../../python_deps.include"/>

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM debian:jessie FROM debian:stretch
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../python_deps.include"/> <%include file="../../python_deps.include"/>

@ -1,6 +1,6 @@
%YAML 1.2 %YAML 1.2
--- | --- |
# Copyright 2015 gRPC authors. # Copyright 2018 The gRPC Authors
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM debian:jessie FROM debian:stretch
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../gcp_api_libraries.include"/> <%include file="../../gcp_api_libraries.include"/>

@ -942,7 +942,7 @@ class CSharpLanguage(object):
self._cmake_arch_option = 'x64' self._cmake_arch_option = 'x64'
else: else:
_check_compiler(self.args.compiler, ['default', 'coreclr']) _check_compiler(self.args.compiler, ['default', 'coreclr'])
self._docker_distro = 'jessie' self._docker_distro = 'stretch'
def test_specs(self): def test_specs(self):
with open('src/csharp/tests.json') as f: with open('src/csharp/tests.json') as f:

Loading…
Cancel
Save