From 6ff393f4051f03c9bdebb2ca840f993f9924fd56 Mon Sep 17 00:00:00 2001 From: Tim Emiola Date: Thu, 10 Sep 2015 11:42:47 -0700 Subject: [PATCH] Remove redundant docker files from grpc repo --- tools/dockerfile/grpc_build_deb/Dockerfile | 51 ------------------ tools/dockerfile/grpc_build_deb/version.txt | 1 - tools/dockerfile/grpc_ruby_deb/Dockerfile | 60 --------------------- tools/dockerfile/grpc_ruby_deb/README.md | 5 -- 4 files changed, 117 deletions(-) delete mode 100644 tools/dockerfile/grpc_build_deb/Dockerfile delete mode 100644 tools/dockerfile/grpc_build_deb/version.txt delete mode 100644 tools/dockerfile/grpc_ruby_deb/Dockerfile delete mode 100644 tools/dockerfile/grpc_ruby_deb/README.md diff --git a/tools/dockerfile/grpc_build_deb/Dockerfile b/tools/dockerfile/grpc_build_deb/Dockerfile deleted file mode 100644 index 7f025b67125..00000000000 --- a/tools/dockerfile/grpc_build_deb/Dockerfile +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2015, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Dockerfile to build Debian packages for gRPC C core. -FROM grpc/base - -# Add the file containing the gRPC version -ADD version.txt version.txt - -# Add the update-to-date distpackages folder -ADD distpackages distpackages - -# Install dependencies -RUN echo 'deb http://http.debian.net/debian experimental main contrib non-free' >> /etc/apt/sources.list -RUN apt-get update \ - && apt-get -t experimental install -y openssl=1.0.2-1 \ - && apt-get install -y lintian - -# Get the source from GitHub -RUN git clone https://github.com/grpc/grpc.git /var/local/git/grpc -RUN cd /var/local/git/grpc && \ - git pull --recurse-submodules && \ - git submodule update --init --recursive - -RUN /bin/bash -l -c 'cd /distpackages && ./build_deb_packages.sh' diff --git a/tools/dockerfile/grpc_build_deb/version.txt b/tools/dockerfile/grpc_build_deb/version.txt deleted file mode 100644 index a918a2aa18d..00000000000 --- a/tools/dockerfile/grpc_build_deb/version.txt +++ /dev/null @@ -1 +0,0 @@ -0.6.0 diff --git a/tools/dockerfile/grpc_ruby_deb/Dockerfile b/tools/dockerfile/grpc_ruby_deb/Dockerfile deleted file mode 100644 index 679fa51f5d5..00000000000 --- a/tools/dockerfile/grpc_ruby_deb/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2015, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Dockerfile for gRPC Ruby, but using Debian packages for gRPC C core. -FROM grpc/ruby_base - -# Pull the latest sources -RUN cd /var/local/git/grpc \ - && git pull --recurse-submodules \ - && git submodule update --init --recursive - -# Make sure we don't rely on things that shouldn't be there. -RUN make clean -C /var/local/git/grpc - -# Debian packages need to be supplied externally -ADD libgrpc_amd64.deb libgrpc_amd64.deb -ADD libgrpc-dev_amd64.deb libgrpc-dev_amd64.deb - -# Install the C core .deb packages -RUN /bin/bash -l -c 'dpkg -i libgrpc_amd64.deb libgrpc-dev_amd64.deb' - -# Build ruby gRPC and run its tests -RUN /bin/bash -l -c 'cd /var/local/git/grpc/src/ruby && bundle && rake' - -# Add a cacerts directory containing the Google root pem file, allowing the -# ruby client to access the production test instance -ADD cacerts cacerts - -# Add a service_account directory containing the auth creds file -ADD service_account service_account - -# Specify the default command such that the interop server runs on its known -# testing port -CMD ["/bin/bash", "-l", "-c", "ruby /var/local/git/grpc/src/ruby/bin/interop/interop_server.rb --use_tls --port 8060"] diff --git a/tools/dockerfile/grpc_ruby_deb/README.md b/tools/dockerfile/grpc_ruby_deb/README.md deleted file mode 100644 index 0a3716b9385..00000000000 --- a/tools/dockerfile/grpc_ruby_deb/README.md +++ /dev/null @@ -1,5 +0,0 @@ -GRPC RUBY Base Dockerfile (Debian package version) -======================== - -Dockerfile for creating the Ruby gRPC development Docker instance. -Uses gRPC C core Debian packages instead of installing it using make.