Refactor Dockerfiles (#6)

Author: Takashi Matsuo

ci/kokoro/Dockerfile.fedora-install renamed to ci/kokoro/Dockerfile.fedora

@@ -0,0 +1,53 @@
+# Copyright 2019 Google LLC
+#
+# 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 update && \
+    apt install -y \
+        automake \
+        build-essential \
+        clang \
+        cmake \
+        curl \
+        doxygen \
+        gawk \
+        git \
+        gcc \
+        golang \
+        g++ \
+        libssl-dev \
+        libtool \
+        make \
+        ninja-build \
+        pkg-config \
+        python-pip \
+        shellcheck \
+        tar \
+        unzip \
+        wget \
+        zlib1g-dev
+
+WORKDIR /var/tmp/Downloads
+RUN wget -q https://github.com/c-ares/c-ares/archive/cares-1_15_0.tar.gz && \
+    tar -xf cares-1_15_0.tar.gz && \
+    cd /var/tmp/Downloads/c-ares-cares-1_15_0 && \
+    ./buildconf && ./configure && make -j $(nproc) && \
+    make install && \
+    ldconfig
+
+# Install grpc from source
+WORKDIR /var/tmp/ci
+COPY install-grpc.sh /var/tmp/ci
+RUN /var/tmp/ci/install-grpc.sh

ci/kokoro/Dockerfile.ubuntu

@@ -0,0 +1,45 @@
+# Copyright 2019 Google LLC
+#
+# 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:18.04
+
+RUN apt update && \
+    apt install -y \
+        build-essential \
+        clang \
+        cmake \
+        curl \
+        doxygen \
+        gawk \
+        git \
+        gcc \
+        golang \
+        g++ \
+        libc-ares-dev \
+        libc-ares2 \
+        libssl-dev \
+        make \
+        ninja-build \
+        pkg-config \
+        python-pip \
+        shellcheck \
+        tar \
+        unzip \
+        wget \
+        zlib1g-dev
+
+# Install grpc from source
+WORKDIR /var/tmp/ci
+COPY install-grpc.sh /var/tmp/ci
+RUN /var/tmp/ci/install-grpc.sh

ci/kokoro/Dockerfile.ubuntu-16.04

@@ -23,6 +23,13 @@ fi
 source "${PROJECT_ROOT}/ci/kokoro/define-docker-variables.sh"
 
 cd "${PROJECT_ROOT}"
-sudo docker build -t "${IMAGE}:tip" \
-     --build-arg DISTRO_VERSION="${DISTRO_VERSION}" \
-     -f "ci/kokoro/Dockerfile.${DISTRO}" ci
+
+# If there's a version specific Dockerfile, we use it.
+if [[ -f "ci/kokoro/Dockerfile.${DISTRO}-${DISTRO_VERSION}" ]]; then
+  sudo docker build -t "${IMAGE}:tip" \
+      -f "ci/kokoro/Dockerfile.${DISTRO}-${DISTRO_VERSION}" ci
+else
+  sudo docker build -t "${IMAGE}:tip" \
+      --build-arg DISTRO_VERSION="${DISTRO_VERSION}" \
+      -f "ci/kokoro/Dockerfile.${DISTRO}" ci
+fi

ci/kokoro/Dockerfile.ubuntu-18.04

@@ -47,7 +47,7 @@ fi
 if [[ "${BUILD_NAME}" = "clang-tidy" ]]; then
   # Compile with clang-tidy(1) turned on. The build treats clang-tidy warnings
   # as errors.
-  export DISTRO=fedora-install
+  export DISTRO=fedora
   export DISTRO_VERSION=30
   export CC=clang
   export CXX=clang++