From 35f2a5974fb6bfe7c0d82d46db196ff848d3e63c Mon Sep 17 00:00:00 2001
From: Michael Wintermeyer <michaelw@palantir.com>
Date: Fri, 24 Mar 2023 11:42:40 -0400
Subject: [PATCH] Change tests to set default with hyphen

---
 .../com/palantir/docker/proxy/DockerProxyExtensionTest.java  | 2 ++
 .../resources/DockerProxyExtensionTest-services.yml          | 5 ++++-
 .../java/com/palantir/docker/proxy/DockerProxyRuleTest.java  | 2 ++
 .../resources/DockerProxyRuleTest-services.yml               | 5 ++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docker-proxy-junit-jupiter/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyExtensionTest.java b/docker-proxy-junit-jupiter/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyExtensionTest.java
index b8b2422d..21897fd5 100644
--- a/docker-proxy-junit-jupiter/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyExtensionTest.java
+++ b/docker-proxy-junit-jupiter/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyExtensionTest.java
@@ -19,6 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import com.palantir.docker.compose.DockerComposeExtension;
+import com.palantir.docker.compose.configuration.ProjectName;
 import com.palantir.docker.compose.connection.Container;
 import com.palantir.docker.compose.logging.LogDirectory;
 import java.io.IOException;
@@ -30,6 +31,7 @@
 class DockerProxyExtensionTest {
     @RegisterExtension
     static final DockerComposeExtension DOCKER_COMPOSE_EXTENSION = DockerComposeExtension.builder()
+            .projectName(ProjectName.fromString("dockerproxyextensiontest"))
             .file("src/integrationTest/resources/DockerProxyExtensionTest-services.yml")
             .saveLogsTo(LogDirectory.circleAwareLogDirectory(DockerProxyExtensionTest.class))
             .waitingForService("webserver", Container::areAllPortsOpen)
diff --git a/docker-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml b/docker-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml
index 5d54df8d..a8242cd3 100644
--- a/docker-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml
+++ b/docker-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml
@@ -1,7 +1,10 @@
-version: '2'
+version: '2.1'
 
 services:
   webserver:
     hostname: web
     domainname: server.here
     image: 1science/nginx
+networks:
+  default:
+    name: dockerproxyextensiontest-default
diff --git a/docker-proxy-rule-junit4/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyRuleTest.java b/docker-proxy-rule-junit4/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyRuleTest.java
index b5e5ea0e..5d9b1f10 100644
--- a/docker-proxy-rule-junit4/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyRuleTest.java
+++ b/docker-proxy-rule-junit4/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyRuleTest.java
@@ -16,6 +16,7 @@
 package com.palantir.docker.proxy;
 
 import com.palantir.docker.compose.DockerComposeRule;
+import com.palantir.docker.compose.configuration.ProjectName;
 import com.palantir.docker.compose.connection.Container;
 import com.palantir.docker.compose.logging.LogDirectory;
 import java.io.IOException;
@@ -27,6 +28,7 @@
 public class DockerProxyRuleTest {
     @ClassRule
     public static final DockerComposeRule DOCKER_COMPOSE_RULE = DockerComposeRule.builder()
+            .projectName(ProjectName.fromString("dockerproxyruletest"))
             .file("src/integrationTest/resources/DockerProxyRuleTest-services.yml")
             .saveLogsTo(LogDirectory.circleAwareLogDirectory(DockerProxyRuleTest.class))
             .waitingForService("webserver", Container::areAllPortsOpen)
diff --git a/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml b/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml
index 5d54df8d..d9b89037 100644
--- a/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml
+++ b/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml
@@ -1,7 +1,10 @@
-version: '2'
+version: '2.1'
 
 services:
   webserver:
     hostname: web
     domainname: server.here
     image: 1science/nginx
+networks:
+  default:
+    name: dockerproxyruletest-default