diff --git a/docs/admin-guide/container.md b/docs/admin-guide/container.md index c0bee4a4..e6827a19 100644 --- a/docs/admin-guide/container.md +++ b/docs/admin-guide/container.md @@ -7,10 +7,10 @@ ## Networking If you have problems with connectivity this might be due to the default docker network range being used by AIT. -Talk to networking@psi.ch which range is safe to use for you! !!! Usage - You can use 10.3.0.0/16 and 10.4.0.0/16 savely. They have been assigned as default docker / podman networks by AIT. + You can use 10.3.0.0/16 and 10.4.0.0/16 savely. They have been assigned as default docker networks by AIT. + Podman's default net 10.88.0.0/16 is save to use. ### Docker-ce example `/etc/docker/daemon.json` @@ -25,29 +25,6 @@ Talk to networking@psi.ch which range is safe to use for you! } ``` -### Podman example -`/etc/containers/networks/podman.json` -``` -{ - "name": "podman", - "id": "podman", - "driver": "bridge", - "network_interface": "podman0", - "subnets": [ - { - "subnet": "10.3.0.0/16", - "gateway": "10.3.0.1" - } - ], - "ipv6_enabled": false, - "internal": false, - "dns_enabled": true, - "ipam_options": { - "driver": "host-local" - } -} -``` - ## Docker Docker-CE will have always the latest features in docker engine and docker compose. The docker repo is enabled by default and the packages can be installed by using follwing code in hiera.