Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14706 from jtattermusch/upload_distribtest_dockerfiles

Browse Source 
Upload all distribtest dockerimages to dockerhub
pull/14710/merge
Jan Tattermusch 7 years ago committed by GitHub
parent 263d6652ad 8f841d23f6
commit 3d10d725b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 8 additions and 184 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. 28
      tools/dockerfile/distribtest/csharp_ubuntu1504_x64/Dockerfile
  2. 28
      tools/dockerfile/distribtest/csharp_ubuntu1510_x64/Dockerfile
  3. 21
      tools/dockerfile/distribtest/node_ubuntu1504_x64/Dockerfile
  4. 21
      tools/dockerfile/distribtest/node_ubuntu1510_x64/Dockerfile
  5. 2
      tools/dockerfile/distribtest/python_arch_x64/Dockerfile
  6. 4
      tools/dockerfile/distribtest/python_ubuntu1204_x64/Dockerfile
  7. 19
      tools/dockerfile/distribtest/python_ubuntu1504_x64/Dockerfile
  8. 19
      tools/dockerfile/distribtest/python_ubuntu1510_x64/Dockerfile
  9. 4
      tools/dockerfile/distribtest/python_wheezy_x64/Dockerfile
  10. 19
      tools/dockerfile/distribtest/ruby_ubuntu1504_x64/Dockerfile
  11. 19
      tools/dockerfile/distribtest/ruby_ubuntu1510_x64/Dockerfile
  12. 2
      tools/dockerfile/push_testing_images.sh
  13. 6
      tools/run_tests/artifacts/distribtest_targets.py

28
tools/dockerfile/distribtest/csharp_ubuntu1504_x64/Dockerfile
Unescape View File

@ -1,28 +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:15.04
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list
RUN apt-get update && apt-get install -y \
mono-devel \
ca-certificates-mono \
nuget
# make sure we have nuget 2.12+ (in case there's an older cached docker image)
RUN apt-get update && apt-get install -y nuget
RUN apt-get update && apt-get install -y unzip

28
tools/dockerfile/distribtest/csharp_ubuntu1510_x64/Dockerfile
Unescape View File

@ -1,28 +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:15.10
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list
RUN apt-get update && apt-get install -y \
mono-devel \
ca-certificates-mono \
nuget
# make sure we have nuget 2.12+ (in case there's an older cached docker image)
RUN apt-get update && apt-get install -y nuget
RUN apt-get update && apt-get install -y unzip

21
tools/dockerfile/distribtest/node_ubuntu1504_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:15.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_ubuntu1510_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:15.10
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

2
tools/dockerfile/distribtest/python_arch_x64/Dockerfile
Unescape View File

@ -18,4 +18,4 @@ RUN pacman --noconfirm -Syy
RUN pacman --noconfirm -S openssl
RUN pacman --noconfirm -S python2
RUN pacman --noconfirm -S python2-pip
RUN pip install virtualenv
RUN pip2 install virtualenv

4
tools/dockerfile/distribtest/python_ubuntu1204_x64/Dockerfile
Unescape View File

@ -16,4 +16,6 @@ FROM ubuntu:12.04
RUN apt-get update -y && apt-get install -y python python-pip
RUN pip install virtualenv
# Use --index-url to workaround
# https://stackoverflow.com/questions/21294997/pip-connection-failure-cannot-fetch-index-base-url-http-pypi-python-org-simpl
RUN pip install --index-url=https://pypi.python.org/simple/ virtualenv

19
tools/dockerfile/distribtest/python_ubuntu1504_x64/Dockerfile
Unescape View File

@ -1,19 +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:15.04
RUN apt-get update -y && apt-get install -y python python-pip
RUN pip install virtualenv

19
tools/dockerfile/distribtest/python_ubuntu1510_x64/Dockerfile
Unescape View File

@ -1,19 +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:15.10
RUN apt-get update -y && apt-get install -y python python-pip
RUN pip install virtualenv

4
tools/dockerfile/distribtest/python_wheezy_x64/Dockerfile
Unescape View File

@ -16,4 +16,6 @@ FROM debian:wheezy
RUN apt-get update -y && apt-get install -y python python-pip
RUN pip install virtualenv
# Use --index-url to workaround
# https://stackoverflow.com/questions/21294997/pip-connection-failure-cannot-fetch-index-base-url-http-pypi-python-org-simpl
RUN pip install --index-url=https://pypi.python.org/simple/ virtualenv

19
tools/dockerfile/distribtest/ruby_ubuntu1504_x64/Dockerfile
Unescape View File

@ -1,19 +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:15.04
RUN apt-get update -y && apt-get install -y ruby-full
RUN gem install bundler

19
tools/dockerfile/distribtest/ruby_ubuntu1510_x64/Dockerfile
Unescape View File

@ -1,19 +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:15.10
RUN apt-get update -y && apt-get install -y ruby-full
RUN gem install bundler

2
tools/dockerfile/push_testing_images.sh
Unescape View File

@ -29,7 +29,7 @@ cd -
DOCKERHUB_ORGANIZATION=grpctesting
for DOCKERFILE_DIR in tools/dockerfile/test/* tools/dockerfile/grpc_artifact_* tools/dockerfile/interoptest/* tools/dockerfile/distribtest/cpp_jessie_x64 third_party/rake-compiler-dock
for DOCKERFILE_DIR in tools/dockerfile/test/* tools/dockerfile/grpc_artifact_* tools/dockerfile/interoptest/* tools/dockerfile/distribtest/* third_party/rake-compiler-dock
do
# Generate image name based on Dockerfile checksum. That works well as long
# as can count on dockerfiles being written in a way that changing the logical

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

@ -293,8 +293,6 @@ def targets():
CSharpDistribTest('linux', 'x86', 'jessie'),
CSharpDistribTest('linux', 'x64', 'centos7'),
CSharpDistribTest('linux', 'x64', 'ubuntu1404'),
CSharpDistribTest('linux', 'x64', 'ubuntu1504'),
CSharpDistribTest('linux', 'x64', 'ubuntu1510'),
CSharpDistribTest('linux', 'x64', 'ubuntu1604'),
CSharpDistribTest('linux', 'x64', 'ubuntu1404', use_dotnet_cli=True),
CSharpDistribTest('macos', 'x86'),
@ -313,8 +311,6 @@ def targets():
PythonDistribTest('linux', 'x64', 'arch'),
PythonDistribTest('linux', 'x64', 'ubuntu1204'),
PythonDistribTest('linux', 'x64', 'ubuntu1404'),
PythonDistribTest('linux', 'x64', 'ubuntu1504'),
PythonDistribTest('linux', 'x64', 'ubuntu1510'),
PythonDistribTest('linux', 'x64', 'ubuntu1604'),
RubyDistribTest('linux', 'x64', 'wheezy'),
RubyDistribTest('linux', 'x64', 'jessie'),
@ -329,8 +325,6 @@ def targets():
RubyDistribTest('linux', 'x64', 'opensuse'),
RubyDistribTest('linux', 'x64', 'ubuntu1204'),
RubyDistribTest('linux', 'x64', 'ubuntu1404'),
RubyDistribTest('linux', 'x64', 'ubuntu1504'),
RubyDistribTest('linux', 'x64', 'ubuntu1510'),
RubyDistribTest('linux', 'x64', 'ubuntu1604'),
PHPDistribTest('linux', 'x64', 'jessie'),
PHPDistribTest('macos', 'x64'),

Write Preview
Loading…
Cancel
Save