diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 246dcd98..00000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -language: java -dist: trusty -sudo: required - -services: - - docker - -jdk: - - oraclejdk8 - - openjdk8 - - oraclejdk9 - -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ - -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ - -before_install: - - pip install --user codecov - -script: - - ./gradlew check - - ./gradlew integrationTest - -after_success: -- codecov diff --git a/build.gradle b/build.gradle index 9a9c910d..d7a59616 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { id "com.github.blindpirate.osgi" version '0.0.3' id "maven-publish" id 'pl.allegro.tech.build.axion-release' version '1.11.0' - id "com.bmuschko.docker-remote-api" version "3.2.1" + id "com.bmuschko.docker-remote-api" version "6.4.0" id "com.github.hierynomus.license" version "0.12.1" id "com.jfrog.bintray" version "1.8.5" id 'ru.vyarus.java-lib' version '1.0.5' @@ -260,22 +260,23 @@ jacocoTestReport { task buildItestImage(type: DockerBuildImage) { inputDir = file('src/itest/docker-image') - tag = 'sshj/sshd-itest' + images.add('sshj/sshd-itest:latest') } task createItestContainer(type: DockerCreateContainer) { dependsOn buildItestImage - targetImageId { buildItestImage.getImageId() } - portBindings = ['2222:22'] + targetImageId buildItestImage.getImageId() + hostConfig.portBindings = ['2222:22'] + hostConfig.autoRemove = true } task startItestContainer(type: DockerStartContainer) { dependsOn createItestContainer - targetContainerId { createItestContainer.getContainerId() } + targetContainerId createItestContainer.getContainerId() } task stopItestContainer(type: DockerStopContainer) { - targetContainerId { createItestContainer.getContainerId() } + targetContainerId createItestContainer.getContainerId() } task forkedUploadRelease(type: GradleBuild) {