diff options
| -rw-r--r-- | docker/Dockerfile.base | 2 | ||||
| -rw-r--r-- | scripts/deploy.sh | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 32b15bee8..2f6929e0d 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -5,7 +5,7 @@ RUN apk add --update build-base RUN apk add --update libffi-dev RUN apk add --update zlib RUN apk add --update jpeg-dev -RUN apk add --update libxml2-dev +RUN apk add --update libxml2 libxml2-dev libxslt-dev RUN apk add --update zlib-dev RUN apk add --update freetype-dev diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 49fa03fcb..d8a5a0176 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -5,6 +5,20 @@ if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo "Connecting to docker hub" echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + changed_lines=$(git diff HEAD~1 HEAD docker/Dockerfile.base | wc -l) + + if [ $changed_lines != '0' ]; then + echo "Dockerfile.base was changed" + + echo "Building bot base" + docker build -t pythondiscord/bot-base:latest -f docker/Dockerfile.base . + + echo "Pushing image to Docker Hub" + docker push pythondiscord/bot-base:latest + else + echo "Dockerfile.base was not changed, not building" + fi + echo "Building image" docker build -t pythondiscord/bot:latest -f docker/Dockerfile . |