From 2dc35806895ba3c771550a010013020441b7c174 Mon Sep 17 00:00:00 2001 From: Michael Wintermeyer Date: Fri, 24 Mar 2023 11:36:35 -0400 Subject: [PATCH] Revert "back to original default" This reverts commit 47d133ee57fad4fcfaa3a89edcd2e0a3b3a35ce5. --- .../com/palantir/docker/proxy/DockerProxyExtensionTest.java | 6 +++--- .../docker/proxy/ProjectBasedDockerContainerInfo.java | 2 +- .../java/com/palantir/docker/proxy/DockerProxyRuleTest.java | 6 +++--- 3 files changed, 7 insertions(+), 7 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 528584d8..b8b2422d 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 @@ -77,7 +77,7 @@ void canReachDockerContainerByHostnameAndDomainNameWithProjectSpecified() throws @Test void canReachDockerContainerByContainerNameWithNetworkSpecified() throws IOException, InterruptedException { DockerProxyExtension dockerProxyExtension = DockerProxyExtension.fromNetworkName( - DOCKER_COMPOSE_EXTENSION.projectName().asString() + "_default", DockerProxyExtensionTest.class); + DOCKER_COMPOSE_EXTENSION.projectName().asString() + "-default", DockerProxyExtensionTest.class); try { dockerProxyExtension.before(); URLConnection urlConnection = new URL("http://webserver").openConnection(); @@ -90,7 +90,7 @@ void canReachDockerContainerByContainerNameWithNetworkSpecified() throws IOExcep @Test void canReachDockerContainerByHostnameWithNetworkSpecified() throws IOException, InterruptedException { DockerProxyExtension dockerProxyExtension = DockerProxyExtension.fromNetworkName( - DOCKER_COMPOSE_EXTENSION.projectName().asString() + "_default", DockerProxyExtensionTest.class); + DOCKER_COMPOSE_EXTENSION.projectName().asString() + "-default", DockerProxyExtensionTest.class); try { dockerProxyExtension.before(); URLConnection urlConnection = new URL("http://web").openConnection(); @@ -103,7 +103,7 @@ void canReachDockerContainerByHostnameWithNetworkSpecified() throws IOException, @Test void canReachDockerContainerByHostnameAndDomainNameWithNetworkSpecified() throws IOException, InterruptedException { DockerProxyExtension dockerProxyExtension = DockerProxyExtension.fromNetworkName( - DOCKER_COMPOSE_EXTENSION.projectName().asString() + "_default", DockerProxyExtensionTest.class); + DOCKER_COMPOSE_EXTENSION.projectName().asString() + "-default", DockerProxyExtensionTest.class); try { dockerProxyExtension.before(); URLConnection urlConnection = new URL("http://web.server.here").openConnection(); diff --git a/docker-proxy-rule-core/src/main/java/com/palantir/docker/proxy/ProjectBasedDockerContainerInfo.java b/docker-proxy-rule-core/src/main/java/com/palantir/docker/proxy/ProjectBasedDockerContainerInfo.java index ff65f976..421bcd59 100644 --- a/docker-proxy-rule-core/src/main/java/com/palantir/docker/proxy/ProjectBasedDockerContainerInfo.java +++ b/docker-proxy-rule-core/src/main/java/com/palantir/docker/proxy/ProjectBasedDockerContainerInfo.java @@ -67,7 +67,7 @@ public Optional getHostForIp(String ip) { @Override public String getNetworkName() { - return networkNameOverride.orElseGet(() -> projectName.asString() + "_default"); + return networkNameOverride.orElseGet(() -> projectName.asString() + "-default"); } @Override 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 a4184407..b5e5ea0e 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 @@ -75,7 +75,7 @@ public void canReachDockerContainerByHostnameAndDomainNameWithProjectSpecified() @Test public void canReachDockerContainerByContainerNameWithNetworkSpecified() throws IOException, InterruptedException { DockerProxyRule dockerProxyRule = DockerProxyRule.fromNetworkName( - DOCKER_COMPOSE_RULE.projectName().asString() + "_default", DockerProxyRuleTest.class); + DOCKER_COMPOSE_RULE.projectName().asString() + "-default", DockerProxyRuleTest.class); try { dockerProxyRule.before(); URLConnection urlConnection = new URL("http://webserver").openConnection(); @@ -88,7 +88,7 @@ public void canReachDockerContainerByContainerNameWithNetworkSpecified() throws @Test public void canReachDockerContainerByHostnameWithNetworkSpecified() throws IOException, InterruptedException { DockerProxyRule dockerProxyRule = DockerProxyRule.fromNetworkName( - DOCKER_COMPOSE_RULE.projectName().asString() + "_default", DockerProxyRuleTest.class); + DOCKER_COMPOSE_RULE.projectName().asString() + "-default", DockerProxyRuleTest.class); try { dockerProxyRule.before(); URLConnection urlConnection = new URL("http://web").openConnection(); @@ -102,7 +102,7 @@ public void canReachDockerContainerByHostnameWithNetworkSpecified() throws IOExc public void canReachDockerContainerByHostnameAndDomainNameWithNetworkSpecified() throws IOException, InterruptedException { DockerProxyRule dockerProxyRule = DockerProxyRule.fromNetworkName( - DOCKER_COMPOSE_RULE.projectName().asString() + "_default", DockerProxyRuleTest.class); + DOCKER_COMPOSE_RULE.projectName().asString() + "-default", DockerProxyRuleTest.class); try { dockerProxyRule.before(); URLConnection urlConnection = new URL("http://web.server.here").openConnection();