JPERF-445: Support sudo and Docker in Docker

Augment the vast `docker-java` lib rather than hiding it under our layers.
Drop `testcontainers` in favor of the underlying `docker-java` API.
Use `com.atlassian.performance.tools:ssh` for more interoperability.
This new API is already tested in `virtual-users` (merged for weeks) and locally in `infrastructure` (tested tens of times today).

Author: dagguh

CHANGELOG.md

@@ -23,6 +23,15 @@ Dropping a requirement of a major version of a dependency is a new contract.
 ## [Unreleased]
 [Unreleased]: https://github.com/atlassian/ssh-ubuntu/compare/master...release-0.1.0
 
+### Removed
+- Remove `SshUbuntu`.
+
+### Added
+- Add `SudoSshUbuntuImage`. Resolve [JPERF-445].
+- Add `AutoCloseable` wrappers for some `docker-java` resources.
+
+[JPERF-445]: https://ecosystem.atlassian.net/browse/JPERF-445
+
 ## [0.1.0] - 2019-02-15
 [0.1.0]: https://github.com/atlassian/ssh-ubuntu/compare/release-0.1.0...initial-commit
 

README.md

@@ -1,8 +1,14 @@
 [![Build Status](https://travis-ci.com/atlassian/ssh-ubuntu.svg?branch=master)](https://travis-ci.com/atlassian/ssh-ubuntu)
 
-# Ssh Ubuntu
+# SSH Ubuntu
+>>>>>>> bc63cb3... JPERF-445: Support sudo and Docker in Docker
 
-Provides SSH to Ubuntu based machine.
+Provides SSH to an Ubuntu instance, which can:
+ * run Docker
+ * run `sudo`
+ * connect to containers in a Docker network
+
+Requires Docker.
 
 ## Reporting issues
 
@@ -15,4 +21,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## License
 Copyright (c) 2018 Atlassian and others.
-Apache 2.0 licensed, see [LICENSE.txt](LICENSE.txt) file.
+Apache 2.0 licensed, see [LICENSE.txt](LICENSE.txt) file.

build.gradle.kts

@@ -1,13 +1,7 @@
-import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
-import com.bmuschko.gradle.docker.tasks.image.DockerPushImage
-import pl.allegro.tech.build.axion.release.OutputCurrentVersionTask
-import pl.allegro.tech.build.axion.release.infrastructure.di.GradleAwareContext
-
 val kotlinVersion = "1.2.70"
 
 plugins {
     kotlin("jvm").version("1.2.70")
-    id("com.bmuschko.docker-remote-api").version("4.4.0")
     `java-library`
     id("com.atlassian.performance.tools.gradle-release").version("0.5.0")
 }
@@ -18,7 +12,11 @@ configurations.all {
         failOnVersionConflict()
         eachDependency {
             when (requested.module.toString()) {
-                "org.jetbrains:annotations" -> useVersion("13.0")
+                "javax.annotation:javax.annotation-api" -> useVersion("1.3.2")
+                "org.apache.httpcomponents:httpclient" -> useVersion("4.5.6")
+                "commons-codec:commons-codec" -> useVersion("1.11")
+                "org.bouncycastle:bcpkix-jdk15on" -> useVersion("1.60")
+                "org.bouncycastle:bcprov-jdk15on" -> useVersion("1.60")
                 "org.slf4j:slf4j-api" -> useVersion("1.7.25")
             }
             when (requested.group) {
@@ -29,14 +27,14 @@ configurations.all {
 }
 
 dependencies {
+    api("com.atlassian.performance.tools:ssh:[2.0.0,3.0.0)")
+    api("com.github.docker-java:docker-java:3.1.1")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
-    implementation("org.testcontainers:testcontainers:1.10.5")
     log4j(
         "api",
         "core",
         "slf4j-impl"
     ).forEach { implementation(it) }
-    testCompile("com.atlassian.performance.tools:ssh:[2.0.0,3.0.0)")
     testCompile("junit:junit:4.12")
     testCompile("org.assertj:assertj-core:3.11.1")
 }
@@ -51,32 +49,3 @@ tasks.getByName("wrapper", Wrapper::class).apply {
     gradleVersion = "5.0"
     distributionType = Wrapper.DistributionType.ALL
 }
-
-val sshDockerImageName = "atlassian/ssh-ubuntu:${project.version}"
-
-val buildDocker = task<DockerBuildImage>("buildDocker") {
-    inputDir.set(file("docker"))
-    tags.add(sshDockerImageName)
-}
-
-val pushDocker = task<DockerPushImage>("pushDocker") {
-    dependsOn(buildDocker)
-    this.imageName.set(sshDockerImageName)
-    this.registryCredentials.username.set(System.getenv("DOCKER_USERNAME"))
-    this.registryCredentials.password.set(System.getenv("DOCKER_PASSWORD"))
-}
-
-val generateProperties = task<Task>("generateProperties") {
-    dependsOn(tasks["processResources"])
-    doLast {
-        File("$buildDir/resources/main/app.properties").bufferedWriter().use { writer ->
-            mapOf("version" to project.version.toString())
-                .toProperties()
-                .store(writer,null)
-        }
-    }
-}
-
-tasks["publish"].dependsOn(pushDocker)
-tasks["classes"].dependsOn(generateProperties)
-tasks["build"].dependsOn(buildDocker)

docker/Dockerfile

@@ -1,3 +1,69 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.atlassian.performance.tools:io:1.2.0
+com.atlassian.performance.tools:jvm-tasks:1.0.0
+com.atlassian.performance.tools:ssh:2.2.0
+com.fasterxml.jackson.core:jackson-annotations:2.9.0
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.9.7
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.9.7
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.7
+com.github.docker-java:docker-java:3.1.1
+com.google.guava:guava:19.0
+com.hierynomus:sshj:0.23.0
+com.jcraft:jzlib:1.1.3
+com.kohlschutter.junixsocket:junixsocket-common:2.0.4
+com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4
+commons-codec:commons-codec:1.11
+commons-io:commons-io:2.6
+commons-lang:commons-lang:2.6
+commons-logging:commons-logging:1.2
+io.netty:netty-buffer:4.1.31.Final
+io.netty:netty-codec-http:4.1.31.Final
+io.netty:netty-codec-socks:4.1.31.Final
+io.netty:netty-codec:4.1.31.Final
+io.netty:netty-common:4.1.31.Final
+io.netty:netty-handler-proxy:4.1.31.Final
+io.netty:netty-handler:4.1.31.Final
+io.netty:netty-resolver:4.1.31.Final
+io.netty:netty-transport-native-epoll:4.1.31.Final
+io.netty:netty-transport-native-kqueue:4.1.31.Final
+io.netty:netty-transport-native-unix-common:4.1.31.Final
+io.netty:netty-transport:4.1.31.Final
+javax.annotation:javax.annotation-api:1.3.2
+javax.inject:javax.inject:1
+javax.ws.rs:javax.ws.rs-api:2.1
+log4j:log4j:1.2.17
+net.i2p.crypto:eddsa:0.2.0
+org.apache.commons:commons-compress:1.18
+org.apache.httpcomponents:httpclient:4.5.6
+org.apache.httpcomponents:httpcore:4.4.10
+org.apache.logging.log4j:log4j-api:2.10.0
+org.apache.logging.log4j:log4j-core:2.10.0
+org.apache.logging.log4j:log4j-slf4j-impl:2.10.0
+org.bouncycastle:bcpkix-jdk15on:1.60
+org.bouncycastle:bcprov-jdk15on:1.60
+org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b42
+org.glassfish.hk2.external:javax.inject:2.5.0-b42
+org.glassfish.hk2:hk2-api:2.5.0-b42
+org.glassfish.hk2:hk2-locator:2.5.0-b42
+org.glassfish.hk2:hk2-utils:2.5.0-b42
+org.glassfish.hk2:osgi-resource-locator:1.0.1
+org.glassfish.jersey.connectors:jersey-apache-connector:2.27
+org.glassfish.jersey.core:jersey-client:2.27
+org.glassfish.jersey.core:jersey-common:2.27
+org.glassfish.jersey.inject:jersey-hk2:2.27
+org.glassfish:javax.json:1.1
+org.javassist:javassist:3.22.0-CR2
+org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
+org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
+org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
+org.jetbrains.kotlin:kotlin-stdlib:1.2.70
+org.jetbrains:annotations:13.0
+org.scijava:native-lib-loader:2.0.2
+org.slf4j:jcl-over-slf4j:1.7.25
+org.slf4j:slf4j-api:1.7.25

docker/authorized_keys

@@ -1,27 +1,69 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.atlassian.performance.tools:io:1.2.0
+com.atlassian.performance.tools:jvm-tasks:1.0.0
+com.atlassian.performance.tools:ssh:2.2.0
+com.fasterxml.jackson.core:jackson-annotations:2.9.0
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.9.7
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.9.7
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.7
+com.github.docker-java:docker-java:3.1.1
+com.google.guava:guava:19.0
+com.hierynomus:sshj:0.23.0
+com.jcraft:jzlib:1.1.3
 com.kohlschutter.junixsocket:junixsocket-common:2.0.4
 com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4
-javax.activation:javax.activation-api:1.2.0
+commons-codec:commons-codec:1.11
+commons-io:commons-io:2.6
+commons-lang:commons-lang:2.6
+commons-logging:commons-logging:1.2
+io.netty:netty-buffer:4.1.31.Final
+io.netty:netty-codec-http:4.1.31.Final
+io.netty:netty-codec-socks:4.1.31.Final
+io.netty:netty-codec:4.1.31.Final
+io.netty:netty-common:4.1.31.Final
+io.netty:netty-handler-proxy:4.1.31.Final
+io.netty:netty-handler:4.1.31.Final
+io.netty:netty-resolver:4.1.31.Final
+io.netty:netty-transport-native-epoll:4.1.31.Final
+io.netty:netty-transport-native-kqueue:4.1.31.Final
+io.netty:netty-transport-native-unix-common:4.1.31.Final
+io.netty:netty-transport:4.1.31.Final
 javax.annotation:javax.annotation-api:1.3.2
-javax.xml.bind:jaxb-api:2.3.1
-junit:junit:4.12
-net.java.dev.jna:jna-platform:5.2.0
-net.java.dev.jna:jna:5.2.0
+javax.inject:javax.inject:1
+javax.ws.rs:javax.ws.rs-api:2.1
+log4j:log4j:1.2.17
+net.i2p.crypto:eddsa:0.2.0
 org.apache.commons:commons-compress:1.18
+org.apache.httpcomponents:httpclient:4.5.6
+org.apache.httpcomponents:httpcore:4.4.10
 org.apache.logging.log4j:log4j-api:2.10.0
 org.apache.logging.log4j:log4j-core:2.10.0
 org.apache.logging.log4j:log4j-slf4j-impl:2.10.0
-org.hamcrest:hamcrest-core:1.3
+org.bouncycastle:bcpkix-jdk15on:1.60
+org.bouncycastle:bcprov-jdk15on:1.60
+org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b42
+org.glassfish.hk2.external:javax.inject:2.5.0-b42
+org.glassfish.hk2:hk2-api:2.5.0-b42
+org.glassfish.hk2:hk2-locator:2.5.0-b42
+org.glassfish.hk2:hk2-utils:2.5.0-b42
+org.glassfish.hk2:osgi-resource-locator:1.0.1
+org.glassfish.jersey.connectors:jersey-apache-connector:2.27
+org.glassfish.jersey.core:jersey-client:2.27
+org.glassfish.jersey.core:jersey-common:2.27
+org.glassfish.jersey.inject:jersey-hk2:2.27
+org.glassfish:javax.json:1.1
+org.javassist:javassist:3.22.0-CR2
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
+org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
+org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib:1.2.70
 org.jetbrains:annotations:13.0
-org.rnorth.duct-tape:duct-tape:1.0.7
-org.rnorth.visible-assertions:visible-assertions:2.1.2
-org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
+org.slf4j:jcl-over-slf4j:1.7.25
 org.slf4j:slf4j-api:1.7.25
-org.testcontainers:testcontainers:1.10.5

gradle/dependency-locks/apiDependenciesMetadata.lockfile

@@ -1,27 +1,69 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.atlassian.performance.tools:io:1.2.0
+com.atlassian.performance.tools:jvm-tasks:1.0.0
+com.atlassian.performance.tools:ssh:2.2.0
+com.fasterxml.jackson.core:jackson-annotations:2.9.0
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.9.7
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.9.7
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.7
+com.github.docker-java:docker-java:3.1.1
+com.google.guava:guava:19.0
+com.hierynomus:sshj:0.23.0
+com.jcraft:jzlib:1.1.3
 com.kohlschutter.junixsocket:junixsocket-common:2.0.4
 com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4
-javax.activation:javax.activation-api:1.2.0
+commons-codec:commons-codec:1.11
+commons-io:commons-io:2.6
+commons-lang:commons-lang:2.6
+commons-logging:commons-logging:1.2
+io.netty:netty-buffer:4.1.31.Final
+io.netty:netty-codec-http:4.1.31.Final
+io.netty:netty-codec-socks:4.1.31.Final
+io.netty:netty-codec:4.1.31.Final
+io.netty:netty-common:4.1.31.Final
+io.netty:netty-handler-proxy:4.1.31.Final
+io.netty:netty-handler:4.1.31.Final
+io.netty:netty-resolver:4.1.31.Final
+io.netty:netty-transport-native-epoll:4.1.31.Final
+io.netty:netty-transport-native-kqueue:4.1.31.Final
+io.netty:netty-transport-native-unix-common:4.1.31.Final
+io.netty:netty-transport:4.1.31.Final
 javax.annotation:javax.annotation-api:1.3.2
-javax.xml.bind:jaxb-api:2.3.1
-junit:junit:4.12
-net.java.dev.jna:jna-platform:5.2.0
-net.java.dev.jna:jna:5.2.0
+javax.inject:javax.inject:1
+javax.ws.rs:javax.ws.rs-api:2.1
+log4j:log4j:1.2.17
+net.i2p.crypto:eddsa:0.2.0
 org.apache.commons:commons-compress:1.18
+org.apache.httpcomponents:httpclient:4.5.6
+org.apache.httpcomponents:httpcore:4.4.10
 org.apache.logging.log4j:log4j-api:2.10.0
 org.apache.logging.log4j:log4j-core:2.10.0
 org.apache.logging.log4j:log4j-slf4j-impl:2.10.0
-org.hamcrest:hamcrest-core:1.3
+org.bouncycastle:bcpkix-jdk15on:1.60
+org.bouncycastle:bcprov-jdk15on:1.60
+org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b42
+org.glassfish.hk2.external:javax.inject:2.5.0-b42
+org.glassfish.hk2:hk2-api:2.5.0-b42
+org.glassfish.hk2:hk2-locator:2.5.0-b42
+org.glassfish.hk2:hk2-utils:2.5.0-b42
+org.glassfish.hk2:osgi-resource-locator:1.0.1
+org.glassfish.jersey.connectors:jersey-apache-connector:2.27
+org.glassfish.jersey.core:jersey-client:2.27
+org.glassfish.jersey.core:jersey-common:2.27
+org.glassfish.jersey.inject:jersey-hk2:2.27
+org.glassfish:javax.json:1.1
+org.javassist:javassist:3.22.0-CR2
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
+org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
+org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib:1.2.70
 org.jetbrains:annotations:13.0
-org.rnorth.duct-tape:duct-tape:1.0.7
-org.rnorth.visible-assertions:visible-assertions:2.1.2
-org.rnorth:tcp-unix-socket-proxy:1.0.2
 org.scijava:native-lib-loader:2.0.2
+org.slf4j:jcl-over-slf4j:1.7.25
 org.slf4j:slf4j-api:1.7.25
-org.testcontainers:testcontainers:1.10.5