|
|
@ -36,13 +36,13 @@ DOCKER_IMAGE_NAME=$(basename $DOCKERFILE_DIR)_$(sha1sum $DOCKERFILE_DIR/Dockerfi |
|
|
|
# Pull the base image to force an update |
|
|
|
# Pull the base image to force an update |
|
|
|
if [ "$DOCKER_BASE_IMAGE" != "" ] |
|
|
|
if [ "$DOCKER_BASE_IMAGE" != "" ] |
|
|
|
then |
|
|
|
then |
|
|
|
docker pull $DOCKER_BASE_IMAGE |
|
|
|
time docker pull $DOCKER_BASE_IMAGE |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
if [ "$DOCKERHUB_ORGANIZATION" != "" ] |
|
|
|
if [ "$DOCKERHUB_ORGANIZATION" != "" ] |
|
|
|
then |
|
|
|
then |
|
|
|
DOCKER_IMAGE_NAME=$DOCKERHUB_ORGANIZATION/$DOCKER_IMAGE_NAME |
|
|
|
DOCKER_IMAGE_NAME=$DOCKERHUB_ORGANIZATION/$DOCKER_IMAGE_NAME |
|
|
|
docker pull $DOCKER_IMAGE_NAME |
|
|
|
time docker pull $DOCKER_IMAGE_NAME |
|
|
|
else |
|
|
|
else |
|
|
|
# Make sure docker image has been built. Should be instantaneous if so. |
|
|
|
# Make sure docker image has been built. Should be instantaneous if so. |
|
|
|
docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR |
|
|
|
docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR |
|
|
|