move dockerfiles where they belong

pull/4885/head
Jan Tattermusch 9 years ago
parent adc9c08123
commit 8453acde02
  1. 0
      tools/dockerfile/grpc_interop_csharp/Dockerfile
  2. 0
      tools/dockerfile/grpc_interop_csharp/build_interop.sh
  3. 0
      tools/dockerfile/grpc_interop_cxx/Dockerfile
  4. 0
      tools/dockerfile/grpc_interop_cxx/build_interop.sh
  5. 0
      tools/dockerfile/grpc_interop_go/Dockerfile
  6. 0
      tools/dockerfile/grpc_interop_go/build_interop.sh
  7. 0
      tools/dockerfile/grpc_interop_http2/Dockerfile
  8. 0
      tools/dockerfile/grpc_interop_http2/build_interop.sh
  9. 0
      tools/dockerfile/grpc_interop_java/Dockerfile
  10. 0
      tools/dockerfile/grpc_interop_java/build_interop.sh
  11. 0
      tools/dockerfile/grpc_interop_node/Dockerfile
  12. 0
      tools/dockerfile/grpc_interop_node/build_interop.sh
  13. 0
      tools/dockerfile/grpc_interop_php/Dockerfile
  14. 0
      tools/dockerfile/grpc_interop_php/build_interop.sh
  15. 0
      tools/dockerfile/grpc_interop_python/Dockerfile
  16. 0
      tools/dockerfile/grpc_interop_python/build_interop.sh
  17. 0
      tools/dockerfile/grpc_interop_ruby/Dockerfile
  18. 0
      tools/dockerfile/grpc_interop_ruby/build_interop.sh
  19. 0
      tools/dockerfile/grpc_interop_stress_cxx/Dockerfile
  20. 0
      tools/dockerfile/grpc_interop_stress_cxx/build_interop_stress.sh
  21. 0
      tools/dockerfile/grpc_linuxbrew/Dockerfile
  22. 6
      tools/jenkins/build_interop_image.sh
  23. 6
      tools/jenkins/build_interop_stress_image.sh
  24. 4
      tools/jenkins/run_distribution.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=$?

@ -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=$?

@ -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 \

Loading…
Cancel
Save