From 47bd265f1a68d21e58975967b90656d33f680983 Mon Sep 17 00:00:00 2001 From: Sam-Kramer Date: Mon, 24 Oct 2022 11:51:36 +0100 Subject: [PATCH] Change network name config as it is deprecated (#543) Use non-deprecated format for specifying an external network name --- changelog/@unreleased/pr-543.v2.yml | 5 +++++ .../resources/DockerProxyExtensionTest-services.yml | 3 ++- .../src/main/resources/docker-compose.proxy.yml | 4 ++-- .../resources/DockerProxyRuleTest-services.yml | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) 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 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 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}} 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