Skip to content
Snippets Groups Projects
Commit a61a2ac3 authored by adelez's avatar adelez Committed by GitHub
Browse files

Merge pull request #11790 from adelez/ci2

Change ci script permission and pull from dockerhub
parents 1a984a55 e2810d2f
No related branches found
No related tags found
No related merge requests found
File mode changed from 100644 to 100755
...@@ -67,8 +67,14 @@ else ...@@ -67,8 +67,14 @@ else
BASE_IMAGE=${BASE_NAME}_base:`md5 -r tools/dockerfile/interoptest/$BASE_NAME/Dockerfile | cut -f1 -d\ ` BASE_IMAGE=${BASE_NAME}_base:`md5 -r tools/dockerfile/interoptest/$BASE_NAME/Dockerfile | cut -f1 -d\ `
fi fi
# Make sure base docker image has been built. Should be instantaneous if so. if [ "$DOCKERHUB_ORGANIZATION" != "" ]
docker build -t $BASE_IMAGE --force-rm=true tools/dockerfile/interoptest/$BASE_NAME || exit $? then
DOCKER_IMAGE_NAME=$DOCKERHUB_ORGANIZATION/$BASE_IMAGE
docker pull $DOCKER_IMAGE_NAME
else
# Make sure docker image has been built. Should be instantaneous if so.
docker build -t $BASE_IMAGE --force-rm=true tools/dockerfile/interoptest/$BASE_NAME || exit $?
fi
# Create a local branch so the child Docker script won't complain # Create a local branch so the child Docker script won't complain
git branch -f jenkins-docker git branch -f jenkins-docker
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment