Skip to content

Commit 91105e6

Browse files
committed
Fix integration build
1 parent 4e802ce commit 91105e6

2 files changed

Lines changed: 7 additions & 36 deletions

File tree

.travis.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
id "com.github.blindpirate.osgi" version '0.0.3'
1010
id "maven-publish"
1111
id 'pl.allegro.tech.build.axion-release' version '1.11.0'
12-
id "com.bmuschko.docker-remote-api" version "3.2.1"
12+
id "com.bmuschko.docker-remote-api" version "6.4.0"
1313
id "com.github.hierynomus.license" version "0.12.1"
1414
id "com.jfrog.bintray" version "1.8.5"
1515
id 'ru.vyarus.java-lib' version '1.0.5'
@@ -260,22 +260,23 @@ jacocoTestReport {
260260

261261
task buildItestImage(type: DockerBuildImage) {
262262
inputDir = file('src/itest/docker-image')
263-
tag = 'sshj/sshd-itest'
263+
images.add('sshj/sshd-itest:latest')
264264
}
265265

266266
task createItestContainer(type: DockerCreateContainer) {
267267
dependsOn buildItestImage
268-
targetImageId { buildItestImage.getImageId() }
269-
portBindings = ['2222:22']
268+
targetImageId buildItestImage.getImageId()
269+
hostConfig.portBindings = ['2222:22']
270+
hostConfig.autoRemove = true
270271
}
271272

272273
task startItestContainer(type: DockerStartContainer) {
273274
dependsOn createItestContainer
274-
targetContainerId { createItestContainer.getContainerId() }
275+
targetContainerId createItestContainer.getContainerId()
275276
}
276277

277278
task stopItestContainer(type: DockerStopContainer) {
278-
targetContainerId { createItestContainer.getContainerId() }
279+
targetContainerId createItestContainer.getContainerId()
279280
}
280281

281282
task forkedUploadRelease(type: GradleBuild) {

0 commit comments

Comments
 (0)