From 08996642e9617b15fdccbbe3f2dd5c57df9f0d5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 21:46:31 +0000
Subject: [PATCH] Bump org.testcontainers:testcontainers from 1.17.6 to 1.18.0
 (#268)

* Bump org.testcontainers:testcontainers from 1.17.6 to 1.18.0

Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.17.6 to 1.18.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.18.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Use module name now that com.github.docker-java:docker-java-api:3.3.0 defines an automatic module name in its manifest.

* Fix test

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Big Andy <8012398+big-andy-coates@users.noreply.github.com>
---
 .github/workflows/codeql.yml                                  | 4 +++-
 build.gradle.kts                                              | 2 +-
 executor/src/main/java/module-info.java                       | 2 +-
 .../suite/service/DockerServiceContainerFunctionalTest.java   | 4 +---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c23289c5..3d6188d6 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,6 +1,8 @@
 name: CodeQL
 
 on:
+  push:
+    branches: [ main ]
   pull_request:
     branches: [ main ]
 
@@ -9,7 +11,7 @@ permissions:
 
 jobs:
   analyze:
-    name: Analyze
+    if: ${{ github.run_number != 1 }}
     runs-on: ubuntu-latest
     permissions:
       actions: read
diff --git a/build.gradle.kts b/build.gradle.kts
index 17b2d339..b2f60e8b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -48,7 +48,7 @@ subprojects {
 
     extra.apply {
         set("creekVersion", "0.4.1")
-        set("testContainersVersion", "1.17.6")  // https://mvnrepository.com/artifact/org.testcontainers/testcontainers
+        set("testContainersVersion", "1.18.0")  // https://mvnrepository.com/artifact/org.testcontainers/testcontainers
         set("spotBugsVersion", "4.7.3")         // https://mvnrepository.com/artifact/com.github.spotbugs/spotbugs-annotations
         set("jacksonVersion", "2.14.2")         // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
         set("picocliVersion", "4.7.3")          // https://mvnrepository.com/artifact/info.picocli/picocli
diff --git a/executor/src/main/java/module-info.java b/executor/src/main/java/module-info.java
index 5536c5b5..a0d3ad13 100644
--- a/executor/src/main/java/module-info.java
+++ b/executor/src/main/java/module-info.java
@@ -13,7 +13,7 @@
     requires java.management;
     requires com.github.spotbugs.annotations;
     requires testcontainers;
-    requires docker.java.api;
+    requires com.github.dockerjava.api;
     requires com.fasterxml.jackson.databind;
     requires com.fasterxml.jackson.dataformat.xml;
     requires com.fasterxml.jackson.datatype.jdk8;
diff --git a/executor/src/test/java/org/creekservice/internal/system/test/executor/api/test/env/suite/service/DockerServiceContainerFunctionalTest.java b/executor/src/test/java/org/creekservice/internal/system/test/executor/api/test/env/suite/service/DockerServiceContainerFunctionalTest.java
index 3b6e23ff..60fd8119 100644
--- a/executor/src/test/java/org/creekservice/internal/system/test/executor/api/test/env/suite/service/DockerServiceContainerFunctionalTest.java
+++ b/executor/src/test/java/org/creekservice/internal/system/test/executor/api/test/env/suite/service/DockerServiceContainerFunctionalTest.java
@@ -249,9 +249,7 @@ void shouldThrowOnUnknownDockerImage() {
                 e.getMessage(),
                 startsWith(
                         "Failed to start service: test-service-0, image: i-do-not-exist:latest"));
-        assertThat(e.getCause().getMessage(), containsString("Container startup failed"));
-
-        assertThat(e.getCause().getCause().getMessage(), containsString("Can't get Docker image"));
+        assertThat(e.getCause().getMessage(), containsString("Can't get Docker image"));
     }
 
     @Test