Merge branch 'master' of github.com:whisklabs/docker-it-scala into branch-0.10

# Conflicts:
#	.gitignore
#	.jvmopts
#	.travis.yml
#	build.sbt
#	config/src/main/scala/com/whisk/docker/config/DockerKitConfig.scala
#	config/src/main/scala/com/whisk/docker/config/DockerTypesafeConfig.scala
#	config/src/test/scala/com/whisk/docker/config/test/DockerConfigSpec.scala
#	core/src/main/scala/com/whisk/docker/DockerCommandExecutor.scala
#	core/src/main/scala/com/whisk/docker/DockerContainer.scala
#	core/src/main/scala/com/whisk/docker/DockerContainerManager.scala
#	core/src/main/scala/com/whisk/docker/DockerContainerState.scala
#	core/src/main/scala/com/whisk/docker/DockerKit.scala
#	core/src/main/scala/com/whisk/docker/DockerReadyChecker.scala
#	core/src/main/scala/com/whisk/docker/package.scala
#	impl/docker-java/src/main/scala/com/whisk/docker/impl/dockerjava/DockerJavaExecutor.scala
#	impl/spotify/src/main/scala/com/whisk/docker/impl/spotify/SpotifyDockerCommandExecutor.scala
#	project/build.properties
#	project/plugins.sbt
#	samples/src/main/scala/com/whisk/docker/DockerElasticsearchService.scala
#	samples/src/main/scala/com/whisk/docker/DockerPostgresService.scala
#	scalatest/src/test/scala/com/whisk/docker/AllAtOnceSpec.scala
#	scalatest/src/test/scala/com/whisk/docker/CassandraServiceSpec.scala
#	scalatest/src/test/scala/com/whisk/docker/DependencyGraphReadyCheckSpec.scala
#	scalatest/src/test/scala/com/whisk/docker/DockerContainerLinkingSpec.scala
#	scalatest/src/test/scala/com/whisk/docker/DockerContainerManagerSpec.scala
#	scalatest/src/test/scala/com/whisk/docker/ElasticsearchServiceSpec.scala
#	scalatest/src/test/scala/com/whisk/docker/KafkaServiceSpec.scala
#	scalatest/src/test/scala/com/whisk/docker/MongodbServiceSpec.scala
#	scalatest/src/test/scala/com/whisk/docker/Neo4jServiceSpec.scala
#	scalatest/src/test/scala/com/whisk/docker/PostgresServiceSpec.scala
#	scalatest/src/test/scala/com/whisk/docker/ZookeeperServiceSpec.scala
#	specs2/src/main/scala/com/whisk/docker/specs2/BeforeAfterAllStopOnError.scala
#	specs2/src/main/scala/com/whisk/docker/specs2/DockerTestKit.scala
#	specs2/src/test/scala/com/whisk/docker/AllAtOnceSpec.scala
#	specs2/src/test/scala/com/whisk/docker/CassandraServiceSpec.scala
#	specs2/src/test/scala/com/whisk/docker/ElasticsearchServiceSpec.scala
#	specs2/src/test/scala/com/whisk/docker/KafkaServiceSpec.scala
#	specs2/src/test/scala/com/whisk/docker/MongodbServiceSpec.scala
#	specs2/src/test/scala/com/whisk/docker/Neo4jServiceSpec.scala
#	specs2/src/test/scala/com/whisk/docker/PostgresServiceSpec.scala
#	specs2/src/test/scala/com/whisk/docker/ZookeeperServiceSpec.scala

Author: c-solo

.github/workflows/ci.yaml

@@ -0,0 +1,16 @@
+name: CI
+on:
+  [ push, workflow_dispatch ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 11
+      - name: Build and Test
+        run: sbt -v +test

.gitignore

@@ -3,3 +3,4 @@ target-shaded/
 project/sbt-launch-*.jar
 .idea/
 .DS_Store
+.bsp/

.jvmopts

@@ -1,4 +1,4 @@
 -Xms512M
 -Xmx4096M
 -Xss2M
--XX:MaxMetaspaceSize=1024M
+-XX:MaxMetaspaceSize=1024M

.travis.yml

@@ -1,7 +1,6 @@
 docker-it-scala
 =============
 
-[![Build Status](https://travis-ci.org/whisklabs/docker-it-scala.svg?branch=master)](https://travis-ci.org/whisklabs/docker-it-scala)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.whisk/docker-testkit-core_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.whisk/docker-testkit-core_2.12)
 [![Join the chat at https://gitter.im/whisklabs/docker-it-scala](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/whisklabs/docker-it-scala?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -23,16 +22,16 @@ There are separate artifacts available for these libraries:
 
 ```scala
 libraryDependencies ++= Seq(
-  "com.whisk" %% "docker-testkit-scalatest" % "0.9.5" % "test",
-  "com.whisk" %% "docker-testkit-impl-spotify" % "0.9.5" % "test")
+  "com.whisk" %% "docker-testkit-scalatest" % "0.9.9" % "test",
+  "com.whisk" %% "docker-testkit-impl-spotify" % "0.9.9" % "test")
 ```
 
 **docker-java**
 
 ```scala
 libraryDependencies ++= Seq(
-  "com.whisk" %% "docker-testkit-scalatest" % "0.9.5" % "test",
-  "com.whisk" %% "docker-testkit-impl-docker-java" % "0.9.5" % "test")
+  "com.whisk" %% "docker-testkit-scalatest" % "0.9.9" % "test",
+  "com.whisk" %% "docker-testkit-impl-docker-java" % "0.9.9" % "test")
 ```
 
 You don't necessarily have to use `scalatest` dependency as demonstrated above.
@@ -42,7 +41,7 @@ Have a look at [this specific trait](https://github.com/whisklabs/docker-it-scal
 
 ### Overriding execution environment
 
-If you need to have custom setup for you environment, you need to override `dockerFactory` field,  providing `DockerClient` instance
+If you need to have a custom environment setup, you need to override `dockerFactory` field,  providing `DockerClient` instance
 
 ```scala
 import com.spotify.docker.client.{DefaultDockerClient, DockerClient}
@@ -154,10 +153,14 @@ trait DockerMongodbService extends DockerKitConfig {
 ### Fields
 
 - `image-name` required  (String)
+- `container-name` optional (String)
+- `command` optional (Array of Strings)
+- `entrypoint` optional (Array of Strings)
 - `environmental-variables` optional (Array of Strings)
 - `ready-checker` optional structure
   - `log-line` optional (String)
   - `http-response-code`
+    - `code` optional (Int - defaults to `200`)
     - `port` required (Int)
 	- `path` optional (String - defaults to `/`)
 	- `within` optional (Int)
@@ -172,6 +175,8 @@ trait DockerMongodbService extends DockerKitConfig {
   - `container` required (String)
   - `host`      required (String)
   - `rw`        optional (Boolean - default:false)
+- `memory` optional (Long)
+- `memory-reservation` optional (Long)
 
 # Testkit
 
@@ -197,7 +202,7 @@ class MyMongoSpec extends FlatSpec with Matchers with DockerMongodbService {
 class AllAtOnceSpec extends FlatSpec with Matchers with BeforeAndAfterAll with GivenWhenThen with ScalaFutures
     with DockerElasticsearchService with DockerCassandraService with DockerNeo4jService with DockerMongodbService {
 
-  implicit val pc = PatienceConfig(Span(20, Seconds), Span(1, Second))
+  implicit val pc: PatienceConfig = PatienceConfig(Span(20, Seconds), Span(1, Second))
 
   "all containers" should "be ready at the same time" in {
     dockerContainers.map(_.image).foreach(println)

README.md

@@ -1,10 +1,10 @@
 lazy val commonSettings = Seq(
   organization := "com.whisk",
   version := "0.10.0-beta9",
-  scalaVersion := "2.13.3",
-  crossScalaVersions := Seq("2.13.3", "2.12.12", "2.11.12"),
+  scalaVersion := "2.13.6",
+  crossScalaVersions := Seq("2.13.6", "2.12.15", "2.11.12", "3.0.2"),
   scalacOptions ++= Seq("-feature", "-deprecation"),
-  fork in Test := true,
+  Test / fork := true,
   licenses += ("MIT", url("http://opensource.org/licenses/MIT")),
   sonatypeProfileName := "com.whisk",
   publishMavenStyle := true,
@@ -46,7 +46,7 @@ lazy val core =
       libraryDependencies ++= Seq(
         "org.slf4j" % "slf4j-api" % "1.7.25",
         "com.spotify" % "docker-client" % "8.16.0",
-        "com.google.code.findbugs" % "jsr305" % "3.0.1",
+        "com.google.code.findbugs" % "jsr305" % "3.0.1"
       )
     )
 
@@ -80,14 +80,16 @@ lazy val tests =
     )
     .dependsOn(core, scalatest, samples % "test")
 
-
 lazy val coreShaded =
   project
     .in(file("core"))
     .settings(commonSettings: _*)
-    .settings(name := "docker-testkit-core-shaded",
+    .settings(
+      name := "docker-testkit-core-shaded",
       libraryDependencies ++=
-        Seq("com.spotify" % "docker-client" % "8.16.0" classifier "shaded",
-          "com.google.code.findbugs" % "jsr305" % "3.0.1"),
+        Seq(
+          "com.spotify" % "docker-client" % "8.16.0" classifier "shaded",
+          "com.google.code.findbugs" % "jsr305" % "3.0.1"
+        ),
       target := baseDirectory.value / "target-shaded"
-    )
+    )

build.sbt

@@ -0,0 +1,9 @@
+#scala #docker #integration-testing
+
+## Highlights
+
+* add cross-compilation for scala [2.13.0](https://github.com/scala/scala/releases/tag/v2.13.0)
+* updated [sbt](https://github.com/sbt/sbt) to 1.2.8
+* updated [scalatest](https://github.com/scalatest/scalatest) to 3.0.8
+* updated [specs2-core](https://github.com/etorreborre/specs2) to 4.5.1
+* updated [ficus](https://github.com/iheartradio/ficus) to 1.4.7

notes/0.9.9.markdown

@@ -1 +1 @@
-sbt.version=1.3.13
+sbt.version=1.5.5

project/build.properties

@@ -1,5 +1,7 @@
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5")
+
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.18-1")