diff --git a/.travis.yml b/.travis.yml index 697575b..4fc5ada 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,11 @@ matrix: sudo: required services: docker env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=5.1 + - os: linux + dist: xenial + sudo: required + services: docker + env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.3.3 SWIFT_SNAPSHOT=5.3.3 - os: linux dist: xenial sudo: required diff --git a/build-package.sh b/build-package.sh index 3097e36..cf27a64 100755 --- a/build-package.sh +++ b/build-package.sh @@ -107,10 +107,6 @@ function travis_end () { # Additional packages can be installed by listing them in DOCKER_PACKAGES. # if [ -n "${DOCKER_IMAGE}" ]; then - if [ ! -z "${KITURA_DOCKER_USER}" -a ! -z "${KITURA_DOCKER_PASSWORD}" -a $(echo "${DOCKER_IMAGE}" | egrep -c "^docker.kitura.net") -ne 0 ]; then - echo "${KITURA_DOCKER_PASSWORD}" | docker login docker.kitura.net -u "${KITURA_DOCKER_USER}" - fi - echo ">> Executing build in Docker container: ${DOCKER_IMAGE}" # Check if privileged mode has been requested for if [ -n "${DOCKER_PRIVILEGED}" ]; then