From 667eadb4307365869582cd2d4ddbb9fdd8047887 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 28 Sep 2017 17:36:05 -0400 Subject: [PATCH] Removed Docker bits from CI build --- .travis.yml | 10 ---------- scripts/docker-build.sh | 21 --------------------- 2 files changed, 31 deletions(-) delete mode 100755 scripts/docker-build.sh diff --git a/.travis.yml b/.travis.yml index 2c22e30b9..b4b0f3685 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,6 @@ sudo: required - services: - - docker - postgresql - -env: - - DOCKER_TAG=$TRAVIS_TAG - language: python python: - "2.7" @@ -18,7 +12,3 @@ addons: - postgresql: "9.4" script: - ./scripts/cibuild.sh -after_success: - - if [ ! -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - ./scripts/docker-build.sh; - fi diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh deleted file mode 100755 index f8691461b..000000000 --- a/scripts/docker-build.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" -if [ $? -ne 0 ]; then - echo "docker login failed." - exit 1 -fi - -docker build -t "$DOCKER_REPOSITORY/$DOCKER_IMAGE_NAME:$DOCKER_TAG" . -if [ $? -ne 0 ]; then - echo "docker build failed." - exit 1 -fi - -docker push "$DOCKER_REPOSITORY/$DOCKER_IMAGE_NAME:$DOCKER_TAG" -if [ $? -ne 0 ]; then - echo "docker push failed." - exit 1 -fi - -exit 0