diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-03-03 17:08:37 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-03 17:26:43 -0800 |
| commit | 7d793c167f51d5afff18e13b1dc1c0b060b3aae4 (patch) | |
| tree | 44f716ab6dfbc0065f9837d41197ac26297f3840 /tools/jenkins/build_and_run_docker.sh | |
| parent | 2bda98f79ca9f43091d2033cf02c9732a0515a7a (diff) | |
| download | protobuf-7d793c167f51d5afff18e13b1dc1c0b060b3aae4.tar.gz protobuf-7d793c167f51d5afff18e13b1dc1c0b060b3aae4.tar.bz2 protobuf-7d793c167f51d5afff18e13b1dc1c0b060b3aae4.zip | |
Disable attempt to use ccache for docker build.
Diffstat (limited to 'tools/jenkins/build_and_run_docker.sh')
| -rwxr-xr-x | tools/jenkins/build_and_run_docker.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/jenkins/build_and_run_docker.sh b/tools/jenkins/build_and_run_docker.sh index 18b910a7..ad1075fa 100755 --- a/tools/jenkins/build_and_run_docker.sh +++ b/tools/jenkins/build_and_run_docker.sh @@ -46,15 +46,13 @@ cd - # Use image name based on Dockerfile location checksum DOCKER_IMAGE_NAME=$(basename $DOCKERFILE_DIR)_$(sha1sum $DOCKERFILE_DIR/Dockerfile | cut -f1 -d\ ) +# Make sure docker image has been built. Should be instantaneous if so. +docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR + # Ensure existence of ccache directory CCACHE_DIR=/tmp/protobuf-ccache mkdir -p $CCACHE_DIR -# Make sure docker image has been built. Should be instantaneous if so. -docker build \ - -v $CCACHE_DIR:$CCACHE_DIR \ - -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR - # Choose random name for docker container CONTAINER_NAME="build_and_run_docker_$(uuidgen)" |