ci: use the correct distro version in the builds (#1413)

coryan · web-flow · commit 755c07a79274 · 2020-03-18T11:30:59.000-04:00
diff --git a/ci/kokoro/Dockerfile.fedora-install b/ci/kokoro/Dockerfile.fedora-install
@@ -20,7 +20,7 @@ FROM fedora:${DISTRO_VERSION}
 # tools to compile the dependencies:
 RUN dnf makecache && \
     dnf install -y abi-compliance-checker abi-dumper \
-        clang clang-tools-extra cmake doxygen findutils gcc-c++ git \
+        clang clang-tools-extra cmake diffutils doxygen findutils gcc-c++ git \
         grpc-devel grpc-plugins libcxx-devel libcxxabi-devel libcurl-devel \
         make openssl-devel pkgconfig protobuf-compiler \
         python3 python3-pip ShellCheck \
diff --git a/ci/kokoro/docker/build.sh b/ci/kokoro/docker/build.sh
@@ -249,6 +249,7 @@ docker_build_flags=(
   # upload it.
   "-t" "${IMAGE}:latest"
   "--build-arg" "NCPU=${NCPU}"
+  "--build-arg" "DISTRO_VERSION=${DISTRO_VERSION}"
   "-f" "ci/kokoro/Dockerfile.${DISTRO}"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,7 @@ docker_build_flags=(`
`249`	`249`	`# upload it.`
`250`	`250`	`"-t" "${IMAGE}:latest"`
`251`	`251`	`"--build-arg" "NCPU=${NCPU}"`
	`252`	`+ "--build-arg" "DISTRO_VERSION=${DISTRO_VERSION}"`
`252`	`253`	`"-f" "ci/kokoro/Dockerfile.${DISTRO}"`
`253`	`254`	`)`
`254`	`255`