Skip to content

Commit fb2f039

Browse files
authored
Merge pull request #17176 from dvdksn/engine/networking-overhaul
engine/networking overhaul
2 parents 3cc39e2 + 2be681d commit fb2f039

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+715
-375
lines changed

.github/vale/Vocab/Technology/accept.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ CVEs?
33
DHCP
44
DNS
55
Ethernet
6+
GPG
67
GRUB
78
Git
8-
GPG
99
HTTP
1010
IPs?
1111
IPv[46]
@@ -56,6 +56,7 @@ stdout
5656
subnet
5757
swappable
5858
systemd
59+
ufw
5960
umask
6061
ungated
6162
virtiofs

_data/engine-cli/docker_service_create.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1585,7 +1585,7 @@ examples: |-
15851585
The swarm extends my-network to each node running the service.
15861586
15871587
Containers on the same network can access each other using
1588-
[service discovery](/network/overlay/#container-discovery).
1588+
[service discovery](/network/drivers/overlay/#container-discovery).
15891589
15901590
Long form syntax of `--network` allows to specify list of aliases and driver options:
15911591
`--network name=my-network,alias=web1,driver-opt=field1=value1`

_data/glossary.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ service: |
233233
service account: |
234234
A service account is a Docker ID used for automated management of container images or containerized applications. Service accounts are typically used in automated workflows, and do not share Docker IDs with the members in a Docker Team or Docker Business subscription plan.
235235
service discovery: |
236-
Swarm mode [container discovery](/network/overlay/#container-discovery) is a DNS component internal to the swarm that automatically assigns each service on an overlay network in the swarm a VIP and DNS entry. Containers on the network share DNS mappings for the service through gossip so any container on the network can access the service through its service name.
236+
Swarm mode [container discovery](/network/drivers/overlay/#container-discovery) is a DNS component internal to the swarm that automatically assigns each service on an overlay network in the swarm a VIP and DNS entry. Containers on the network share DNS mappings for the service through gossip so any container on the network can access the service through its service name.
237237
238238
You don’t need to expose service-specific ports to make the service available to other services on the same overlay network. The swarm’s internal load balancer automatically distributes requests to the service VIP among the active tasks.
239239
swarm: |

_data/toc.yaml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,22 +1352,28 @@ manuals:
13521352
section:
13531353
- path: /network/
13541354
title: Overview
1355-
- path: /config/containers/container-networking/
1356-
title: Container networking
1355+
- sectiontitle: Network drivers
1356+
section:
1357+
- path: /network/drivers/
1358+
title: Overview
1359+
- path: /network/drivers/bridge/
1360+
title: Bridge
1361+
- path: /network/drivers/overlay/
1362+
title: Overlay
1363+
- path: /network/drivers/host/
1364+
title: Host
1365+
- path: /network/drivers/ipvlan/
1366+
title: IPvlan
1367+
- path: /network/drivers/macvlan/
1368+
title: Macvlan
1369+
- path: /network/drivers/none/
1370+
title: None (no networking)
13571371
- path: /network/proxy/
13581372
title: Configure Docker to use a proxy server
1359-
- path: /network/bridge/
1360-
title: Bridge networks
1361-
- path: /network/overlay/
1362-
title: Overlay networks
1363-
- path: /network/host/
1364-
title: Host networking
1365-
- path: /network/ipvlan/
1366-
title: IPvlan networks
1367-
- path: /network/macvlan/
1368-
title: Macvlan networks
1369-
- path: /network/none/
1370-
title: Disable networking for a container
1373+
- path: /network/packet-filtering-firewalls/
1374+
title: Packet filtering and firewalls
1375+
- path: /config/daemon/ipv6/
1376+
title: Use IPv6
13711377
- sectiontitle: Networking tutorials
13721378
section:
13731379
- path: /network/network-tutorial-standalone/
@@ -1550,14 +1556,10 @@ manuals:
15501556
title: Configuration overview
15511557
- path: /config/daemon/systemd/
15521558
title: Configure with systemd
1553-
- path: /config/daemon/ipv6/
1554-
title: Use IPv6
15551559
- path: /config/containers/live-restore/
15561560
title: Keep containers alive during daemon downtime
15571561
- path: /config/daemon/troubleshoot/
15581562
title: Troubleshoot
1559-
- path: /network/iptables/
1560-
title: Docker and iptables
15611563
- path: /config/daemon/remote-access/
15621564
title: Remote access
15631565
- path: /engine/context/working-with-contexts/

config/containers/container-networking.md

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)