Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change network name config as it is deprecated #543

Merged
merged 4 commits into from
Oct 24, 2022
Merged

Change network name config as it is deprecated #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5c951b
Change network name config as it is deprecated
Oct 21, 2022
1ec55cd
Also fix hostname formatting
Oct 21, 2022
406b4f2
Add generated changelog entries
svc-changelog Oct 21, 2022
ff357c3
fix last docker file hopefully
Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/@unreleased/pr-543.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion ...r-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ version: '2'

services:
webserver:
hostname: web.server.here
hostname: web
Copy link
Contributor Author

@Sam-Kramer Sam-Kramer Oct 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No longer can resolve the hostname when specifying the FQDN as the hostname; must specify hostname/domainname separately

domainname: server.here
image: 1science/nginx
4 changes: 2 additions & 2 deletions docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ services:

networks:
default:
external:
name: {{NETWORK_NAME}}
external: true
name: {{NETWORK_NAME}}
3 changes: 2 additions & 1 deletion docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ version: '2'

services:
webserver:
hostname: web.server.here
hostname: web
domainname: server.here
image: 1science/nginx