From 8453acde020efe44f879999a6f08470228671c52 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 25 Jan 2016 22:03:06 -0800 Subject: [PATCH] move dockerfiles where they belong --- .../{jenkins => dockerfile}/grpc_interop_csharp/Dockerfile | 0 .../grpc_interop_csharp/build_interop.sh | 0 tools/{jenkins => dockerfile}/grpc_interop_cxx/Dockerfile | 0 .../grpc_interop_cxx/build_interop.sh | 0 tools/{jenkins => dockerfile}/grpc_interop_go/Dockerfile | 0 .../grpc_interop_go/build_interop.sh | 0 tools/{jenkins => dockerfile}/grpc_interop_http2/Dockerfile | 0 .../grpc_interop_http2/build_interop.sh | 0 tools/{jenkins => dockerfile}/grpc_interop_java/Dockerfile | 0 .../grpc_interop_java/build_interop.sh | 0 tools/{jenkins => dockerfile}/grpc_interop_node/Dockerfile | 0 .../grpc_interop_node/build_interop.sh | 0 tools/{jenkins => dockerfile}/grpc_interop_php/Dockerfile | 0 .../grpc_interop_php/build_interop.sh | 0 .../{jenkins => dockerfile}/grpc_interop_python/Dockerfile | 0 .../grpc_interop_python/build_interop.sh | 0 tools/{jenkins => dockerfile}/grpc_interop_ruby/Dockerfile | 0 .../grpc_interop_ruby/build_interop.sh | 0 .../grpc_interop_stress_cxx/Dockerfile | 0 .../grpc_interop_stress_cxx/build_interop_stress.sh | 0 tools/{jenkins => dockerfile}/grpc_linuxbrew/Dockerfile | 0 tools/jenkins/build_interop_image.sh | 6 +++--- tools/jenkins/build_interop_stress_image.sh | 6 +++--- tools/jenkins/run_distribution.sh | 4 ++-- 24 files changed, 8 insertions(+), 8 deletions(-) rename tools/{jenkins => dockerfile}/grpc_interop_csharp/Dockerfile (100%) rename tools/{jenkins => dockerfile}/grpc_interop_csharp/build_interop.sh (100%) rename tools/{jenkins => dockerfile}/grpc_interop_cxx/Dockerfile (100%) rename tools/{jenkins => dockerfile}/grpc_interop_cxx/build_interop.sh (100%) rename tools/{jenkins => dockerfile}/grpc_interop_go/Dockerfile (100%) rename tools/{jenkins => dockerfile}/grpc_interop_go/build_interop.sh (100%) rename tools/{jenkins => dockerfile}/grpc_interop_http2/Dockerfile (100%) rename tools/{jenkins => dockerfile}/grpc_interop_http2/build_interop.sh (100%) rename tools/{jenkins => dockerfile}/grpc_interop_java/Dockerfile (100%) rename tools/{jenkins => dockerfile}/grpc_interop_java/build_interop.sh (100%) rename tools/{jenkins => dockerfile}/grpc_interop_node/Dockerfile (100%) rename tools/{jenkins => dockerfile}/grpc_interop_node/build_interop.sh (100%) rename tools/{jenkins => dockerfile}/grpc_interop_php/Dockerfile (100%) rename tools/{jenkins => dockerfile}/grpc_interop_php/build_interop.sh (100%) rename tools/{jenkins => dockerfile}/grpc_interop_python/Dockerfile (100%) rename tools/{jenkins => dockerfile}/grpc_interop_python/build_interop.sh (100%) rename tools/{jenkins => dockerfile}/grpc_interop_ruby/Dockerfile (100%) rename tools/{jenkins => dockerfile}/grpc_interop_ruby/build_interop.sh (100%) rename tools/{jenkins => dockerfile}/grpc_interop_stress_cxx/Dockerfile (100%) rename tools/{jenkins => dockerfile}/grpc_interop_stress_cxx/build_interop_stress.sh (100%) rename tools/{jenkins => dockerfile}/grpc_linuxbrew/Dockerfile (100%) diff --git a/tools/jenkins/grpc_interop_csharp/Dockerfile b/tools/dockerfile/grpc_interop_csharp/Dockerfile similarity index 100% rename from tools/jenkins/grpc_interop_csharp/Dockerfile rename to tools/dockerfile/grpc_interop_csharp/Dockerfile diff --git a/tools/jenkins/grpc_interop_csharp/build_interop.sh b/tools/dockerfile/grpc_interop_csharp/build_interop.sh similarity index 100% rename from tools/jenkins/grpc_interop_csharp/build_interop.sh rename to tools/dockerfile/grpc_interop_csharp/build_interop.sh diff --git a/tools/jenkins/grpc_interop_cxx/Dockerfile b/tools/dockerfile/grpc_interop_cxx/Dockerfile similarity index 100% rename from tools/jenkins/grpc_interop_cxx/Dockerfile rename to tools/dockerfile/grpc_interop_cxx/Dockerfile diff --git a/tools/jenkins/grpc_interop_cxx/build_interop.sh b/tools/dockerfile/grpc_interop_cxx/build_interop.sh similarity index 100% rename from tools/jenkins/grpc_interop_cxx/build_interop.sh rename to tools/dockerfile/grpc_interop_cxx/build_interop.sh diff --git a/tools/jenkins/grpc_interop_go/Dockerfile b/tools/dockerfile/grpc_interop_go/Dockerfile similarity index 100% rename from tools/jenkins/grpc_interop_go/Dockerfile rename to tools/dockerfile/grpc_interop_go/Dockerfile diff --git a/tools/jenkins/grpc_interop_go/build_interop.sh b/tools/dockerfile/grpc_interop_go/build_interop.sh similarity index 100% rename from tools/jenkins/grpc_interop_go/build_interop.sh rename to tools/dockerfile/grpc_interop_go/build_interop.sh diff --git a/tools/jenkins/grpc_interop_http2/Dockerfile b/tools/dockerfile/grpc_interop_http2/Dockerfile similarity index 100% rename from tools/jenkins/grpc_interop_http2/Dockerfile rename to tools/dockerfile/grpc_interop_http2/Dockerfile diff --git a/tools/jenkins/grpc_interop_http2/build_interop.sh b/tools/dockerfile/grpc_interop_http2/build_interop.sh similarity index 100% rename from tools/jenkins/grpc_interop_http2/build_interop.sh rename to tools/dockerfile/grpc_interop_http2/build_interop.sh diff --git a/tools/jenkins/grpc_interop_java/Dockerfile b/tools/dockerfile/grpc_interop_java/Dockerfile similarity index 100% rename from tools/jenkins/grpc_interop_java/Dockerfile rename to tools/dockerfile/grpc_interop_java/Dockerfile diff --git a/tools/jenkins/grpc_interop_java/build_interop.sh b/tools/dockerfile/grpc_interop_java/build_interop.sh similarity index 100% rename from tools/jenkins/grpc_interop_java/build_interop.sh rename to tools/dockerfile/grpc_interop_java/build_interop.sh diff --git a/tools/jenkins/grpc_interop_node/Dockerfile b/tools/dockerfile/grpc_interop_node/Dockerfile similarity index 100% rename from tools/jenkins/grpc_interop_node/Dockerfile rename to tools/dockerfile/grpc_interop_node/Dockerfile diff --git a/tools/jenkins/grpc_interop_node/build_interop.sh b/tools/dockerfile/grpc_interop_node/build_interop.sh similarity index 100% rename from tools/jenkins/grpc_interop_node/build_interop.sh rename to tools/dockerfile/grpc_interop_node/build_interop.sh diff --git a/tools/jenkins/grpc_interop_php/Dockerfile b/tools/dockerfile/grpc_interop_php/Dockerfile similarity index 100% rename from tools/jenkins/grpc_interop_php/Dockerfile rename to tools/dockerfile/grpc_interop_php/Dockerfile diff --git a/tools/jenkins/grpc_interop_php/build_interop.sh b/tools/dockerfile/grpc_interop_php/build_interop.sh similarity index 100% rename from tools/jenkins/grpc_interop_php/build_interop.sh rename to tools/dockerfile/grpc_interop_php/build_interop.sh diff --git a/tools/jenkins/grpc_interop_python/Dockerfile b/tools/dockerfile/grpc_interop_python/Dockerfile similarity index 100% rename from tools/jenkins/grpc_interop_python/Dockerfile rename to tools/dockerfile/grpc_interop_python/Dockerfile diff --git a/tools/jenkins/grpc_interop_python/build_interop.sh b/tools/dockerfile/grpc_interop_python/build_interop.sh similarity index 100% rename from tools/jenkins/grpc_interop_python/build_interop.sh rename to tools/dockerfile/grpc_interop_python/build_interop.sh diff --git a/tools/jenkins/grpc_interop_ruby/Dockerfile b/tools/dockerfile/grpc_interop_ruby/Dockerfile similarity index 100% rename from tools/jenkins/grpc_interop_ruby/Dockerfile rename to tools/dockerfile/grpc_interop_ruby/Dockerfile diff --git a/tools/jenkins/grpc_interop_ruby/build_interop.sh b/tools/dockerfile/grpc_interop_ruby/build_interop.sh similarity index 100% rename from tools/jenkins/grpc_interop_ruby/build_interop.sh rename to tools/dockerfile/grpc_interop_ruby/build_interop.sh diff --git a/tools/jenkins/grpc_interop_stress_cxx/Dockerfile b/tools/dockerfile/grpc_interop_stress_cxx/Dockerfile similarity index 100% rename from tools/jenkins/grpc_interop_stress_cxx/Dockerfile rename to tools/dockerfile/grpc_interop_stress_cxx/Dockerfile diff --git a/tools/jenkins/grpc_interop_stress_cxx/build_interop_stress.sh b/tools/dockerfile/grpc_interop_stress_cxx/build_interop_stress.sh similarity index 100% rename from tools/jenkins/grpc_interop_stress_cxx/build_interop_stress.sh rename to tools/dockerfile/grpc_interop_stress_cxx/build_interop_stress.sh diff --git a/tools/jenkins/grpc_linuxbrew/Dockerfile b/tools/dockerfile/grpc_linuxbrew/Dockerfile similarity index 100% rename from tools/jenkins/grpc_linuxbrew/Dockerfile rename to tools/dockerfile/grpc_linuxbrew/Dockerfile diff --git a/tools/jenkins/build_interop_image.sh b/tools/jenkins/build_interop_image.sh index 73937068a4f..28d5f31d4f2 100755 --- a/tools/jenkins/build_interop_image.sh +++ b/tools/jenkins/build_interop_image.sh @@ -71,10 +71,10 @@ then fi # Use image name based on Dockerfile checksum -BASE_IMAGE=${BASE_NAME}_base:`sha1sum tools/jenkins/$BASE_NAME/Dockerfile | cut -f1 -d\ ` +BASE_IMAGE=${BASE_NAME}_base:`sha1sum tools/dockerfile/$BASE_NAME/Dockerfile | cut -f1 -d\ ` # Make sure base docker image has been built. Should be instantaneous if so. -docker build -t $BASE_IMAGE --force-rm=true tools/jenkins/$BASE_NAME || exit $? +docker build -t $BASE_IMAGE --force-rm=true tools/dockerfile/$BASE_NAME || exit $? # Create a local branch so the child Docker script won't complain git branch -f jenkins-docker @@ -92,7 +92,7 @@ CONTAINER_NAME="build_${BASE_NAME}_$(uuidgen)" -v /tmp/ccache:/tmp/ccache \ --name=$CONTAINER_NAME \ $BASE_IMAGE \ - bash -l /var/local/jenkins/grpc/tools/jenkins/$BASE_NAME/build_interop.sh \ + bash -l /var/local/jenkins/grpc/tools/dockerfile/$BASE_NAME/build_interop.sh \ && docker commit $CONTAINER_NAME $INTEROP_IMAGE \ && echo "Successfully built image $INTEROP_IMAGE") EXITCODE=$? diff --git a/tools/jenkins/build_interop_stress_image.sh b/tools/jenkins/build_interop_stress_image.sh index 395eaa32d9b..92f2dab5e34 100755 --- a/tools/jenkins/build_interop_stress_image.sh +++ b/tools/jenkins/build_interop_stress_image.sh @@ -55,10 +55,10 @@ then fi # Use image name based on Dockerfile checksum -BASE_IMAGE=${BASE_NAME}_base:`sha1sum tools/jenkins/$BASE_NAME/Dockerfile | cut -f1 -d\ ` +BASE_IMAGE=${BASE_NAME}_base:`sha1sum tools/dockerfile/$BASE_NAME/Dockerfile | cut -f1 -d\ ` # Make sure base docker image has been built. Should be instantaneous if so. -docker build -t $BASE_IMAGE --force-rm=true tools/jenkins/$BASE_NAME || exit $? +docker build -t $BASE_IMAGE --force-rm=true tools/dockerfile/$BASE_NAME || exit $? # Create a local branch so the child Docker script won't complain git branch -f jenkins-docker @@ -75,7 +75,7 @@ CONTAINER_NAME="build_${BASE_NAME}_$(uuidgen)" -v /tmp/ccache:/tmp/ccache \ --name=$CONTAINER_NAME \ $BASE_IMAGE \ - bash -l /var/local/jenkins/grpc/tools/jenkins/$BASE_NAME/build_interop_stress.sh \ + bash -l /var/local/jenkins/grpc/tools/dockerfile/$BASE_NAME/build_interop_stress.sh \ && docker commit $CONTAINER_NAME $INTEROP_IMAGE \ && echo "Successfully built image $INTEROP_IMAGE") EXITCODE=$? diff --git a/tools/jenkins/run_distribution.sh b/tools/jenkins/run_distribution.sh index 64c60f15027..306b85b045c 100755 --- a/tools/jenkins/run_distribution.sh +++ b/tools/jenkins/run_distribution.sh @@ -47,11 +47,11 @@ if [ "$platform" == "linux" ]; then if [ "$dist_channel" == "homebrew" ]; then - sha1=$(sha1sum tools/jenkins/grpc_linuxbrew/Dockerfile | cut -f1 -d\ ) + sha1=$(sha1sum tools/dockerfile/grpc_linuxbrew/Dockerfile | cut -f1 -d\ ) DOCKER_IMAGE_NAME=grpc_linuxbrew_$sha1 # build docker image, contains all pre-requisites - docker build -t $DOCKER_IMAGE_NAME tools/jenkins/grpc_linuxbrew + docker build -t $DOCKER_IMAGE_NAME tools/dockerfile/grpc_linuxbrew # run per-language homebrew installation script docker run --rm=true $DOCKER_IMAGE_NAME bash -l \