From c5c951bd4722cb90f0e21129bb170591e9006557 Mon Sep 17 00:00:00 2001 From: Sam Kramer Date: Fri, 21 Oct 2022 14:27:04 +0100 Subject: [PATCH 1/4] Change network name config as it is deprecated --- .../src/main/resources/docker-compose.proxy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml b/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml index a7e23859..08248bab 100644 --- a/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml +++ b/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml @@ -9,5 +9,5 @@ services: networks: default: - external: - name: {{NETWORK_NAME}} + external: true + name: {{NETWORK_NAME}} From 1ec55cdf318e065965850e96f3591c78dfdd590e Mon Sep 17 00:00:00 2001 From: Sam Kramer Date: Fri, 21 Oct 2022 14:36:29 +0100 Subject: [PATCH 2/4] Also fix hostname formatting --- .../integrationTest/resources/DockerProxyRuleTest-services.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 442df067..5d54df8d 100644 --- a/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml +++ b/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml @@ -2,5 +2,6 @@ version: '2' services: webserver: - hostname: web.server.here + hostname: web + domainname: server.here image: 1science/nginx From 406b4f294896f5d82cdc98586adb907833a3f7e1 Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Fri, 21 Oct 2022 13:37:06 +0000 Subject: [PATCH 3/4] Add generated changelog entries --- changelog/@unreleased/pr-543.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-543.v2.yml diff --git a/changelog/@unreleased/pr-543.v2.yml b/changelog/@unreleased/pr-543.v2.yml new file mode 100644 index 00000000..ba64a6af --- /dev/null +++ b/changelog/@unreleased/pr-543.v2.yml @@ -0,0 +1,5 @@ +type: fix +fix: + description: Use non-deprecated format for specifying an external network name + links: + - https://github.com/palantir/docker-proxy-rule/pull/543 From ff357c3d2c2a52af2b32c9463718e7327b62393c Mon Sep 17 00:00:00 2001 From: Sam Kramer Date: Fri, 21 Oct 2022 14:41:43 +0100 Subject: [PATCH 4/4] fix last docker file hopefully --- .../resources/DockerProxyExtensionTest-services.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 442df067..5d54df8d 100644 --- a/docker-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml +++ b/docker-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml @@ -2,5 +2,6 @@ version: '2' services: webserver: - hostname: web.server.here + hostname: web + domainname: server.here image: 1science/nginx