Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade Ubuntu 14.04 -> 18.04

Browse Source
pull/23749/head
Esun Kim 4 years ago
parent dd348c8c43
commit c0047f46b5
9 changed files with 16 additions and 121 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      tools/dockerfile/distribtest/node_jessie_x64/Dockerfile
  2. 21
      tools/dockerfile/distribtest/node_jessie_x86/Dockerfile
  3. 21
      tools/dockerfile/distribtest/node_ubuntu1404_x64/Dockerfile
  4. 21
      tools/dockerfile/distribtest/node_ubuntu1604_x64/Dockerfile
  5. 4
      tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile
  6. 4
      tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile
  7. 24
      tools/dockerfile/distribtest/ruby_ubuntu1404_x64/Dockerfile
  8. 10
      tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile
  9. 11
      tools/run_tests/artifacts/distribtest_targets.py

21
tools/dockerfile/distribtest/node_jessie_x64/Dockerfile
Unescape View File

@ -1,21 +0,0 @@
# Copyright 2016 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:jessie
RUN apt-get update && apt-get install -y curl
# Install nvm
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash

21
tools/dockerfile/distribtest/node_jessie_x86/Dockerfile
Unescape View File

@ -1,21 +0,0 @@
# Copyright 2016 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM i386/debian:jessie
RUN apt-get update && apt-get install -y curl
# Install nvm
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash

21
tools/dockerfile/distribtest/node_ubuntu1404_x64/Dockerfile
Unescape View File

@ -1,21 +0,0 @@
# Copyright 2016 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM ubuntu:14.04
RUN apt-get update && apt-get install -y curl
# Install nvm
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash

21
tools/dockerfile/distribtest/node_ubuntu1604_x64/Dockerfile
Unescape View File

@ -1,21 +0,0 @@
# Copyright 2016 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM ubuntu:16.04
RUN apt-get update && apt-get install -y curl
# Install nvm
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash

4
tools/dockerfile/distribtest/python_dev_ubuntu1404_x64/Dockerfile → tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile
Unescape View File

@ -1,4 +1,4 @@
# Copyright 2015 gRPC authors.
# Copyright 2020 the gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM ubuntu:14.04
FROM ubuntu:18.04
RUN apt-get update -y && apt-get install -y python python-pip

4
tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile → tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile
Unescape View File

@ -1,4 +1,4 @@
# Copyright 2015 gRPC authors.
# Copyright 2020 the gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM ubuntu:14.04
FROM ubuntu:18.04
RUN apt-get update -y && apt-get install -y python python-pip

24
tools/dockerfile/distribtest/ruby_ubuntu1404_x64/Dockerfile
Unescape View File

@ -1,24 +0,0 @@
# Copyright 2015 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM ubuntu:14.04
RUN apt-get update -y && apt-get install -y curl
# Install rvm
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
RUN \curl -sSL https://get.rvm.io | bash -s stable --ruby
RUN /bin/bash -l -c "echo '. /etc/profile.d/rvm.sh' >> ~/.bashrc"
RUN /bin/bash -l -c "gem install --update bundler"

10
tools/dockerfile/distribtest/node_centos7_x64/Dockerfile → tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile
Unescape View File

@ -1,4 +1,4 @@
# Copyright 2016 gRPC authors.
# Copyright 2020 the gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -12,10 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM centos:7
FROM ubuntu:18.04
RUN yum install -y curl
RUN apt-get update -y && apt-get install -y ruby-full
# Install nvm
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
RUN gem install bundler

11
tools/run_tests/artifacts/distribtest_targets.py
Unescape View File

@ -306,6 +306,7 @@ class CppDistribTest(object):
def targets():
"""Gets list of supported targets"""
return [
# C++
CppDistribTest('linux', 'x64', 'jessie', 'cmake_as_submodule'),
CppDistribTest('linux', 'x64', 'stretch', 'cmake'),
CppDistribTest('linux', 'x64', 'stretch', 'cmake_as_externalproject'),
@ -317,6 +318,7 @@ def targets():
CppDistribTest('linux', 'x64', 'stretch', 'raspberry_pi'),
CppDistribTest('windows', 'x86', testcase='cmake'),
CppDistribTest('windows', 'x86', testcase='cmake_as_externalproject'),
# C#
CSharpDistribTest('linux', 'x64', 'jessie'),
CSharpDistribTest('linux', 'x86', 'jessie'),
CSharpDistribTest('linux', 'x64', 'stretch'),
@ -328,6 +330,7 @@ def targets():
CSharpDistribTest('macos', 'x86'),
CSharpDistribTest('windows', 'x86'),
CSharpDistribTest('windows', 'x64'),
# Python
PythonDistribTest('linux', 'x64', 'jessie'),
PythonDistribTest('linux', 'x86', 'jessie'),
PythonDistribTest('linux', 'x64', 'centos6'),
@ -335,16 +338,17 @@ def targets():
PythonDistribTest('linux', 'x64', 'fedora23'),
PythonDistribTest('linux', 'x64', 'opensuse'),
PythonDistribTest('linux', 'x64', 'arch'),
PythonDistribTest('linux', 'x64', 'ubuntu1404'),
PythonDistribTest('linux', 'x64', 'ubuntu1604'),
PythonDistribTest('linux', 'x64', 'ubuntu1804'),
PythonDistribTest('linux', 'x64', 'alpine3.7', source=True),
PythonDistribTest('linux', 'x64', 'jessie', source=True),
PythonDistribTest('linux', 'x86', 'jessie', source=True),
PythonDistribTest('linux', 'x64', 'centos7', source=True),
PythonDistribTest('linux', 'x64', 'fedora23', source=True),
PythonDistribTest('linux', 'x64', 'arch', source=True),
PythonDistribTest('linux', 'x64', 'ubuntu1404', source=True),
PythonDistribTest('linux', 'x64', 'ubuntu1604', source=True),
PythonDistribTest('linux', 'x64', 'ubuntu1804', source=True),
# Ruby
RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_3'),
RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_4'),
RubyDistribTest('linux', 'x64', 'jessie', ruby_version='ruby_2_5'),
@ -359,8 +363,9 @@ def targets():
RubyDistribTest('linux', 'x64', 'centos7'),
RubyDistribTest('linux', 'x64', 'fedora23'),
RubyDistribTest('linux', 'x64', 'opensuse'),
RubyDistribTest('linux', 'x64', 'ubuntu1404'),
RubyDistribTest('linux', 'x64', 'ubuntu1604'),
RubyDistribTest('linux', 'x64', 'ubuntu1804'),
# PHP
PHPDistribTest('linux', 'x64', 'jessie'),
PHPDistribTest('macos', 'x64'),
]

Write Preview
Loading…
Cancel
Save