switch to upstream docker -- hopefully fixes ipv6 source address issues

This commit is contained in:
Jacob Lifshay 2024-07-14 03:27:19 -07:00
parent a8f3a2fad8
commit 92bb25d2f0
Signed by: programmerjake
SSH key fingerprint: SHA256:B1iRVvUJkvd7upMIiMqn6OyxvD2SgJkAH3ZnUOj6z+c
5 changed files with 28 additions and 42 deletions

View file

@ -0,0 +1 @@
deb [arch=$dpkg_arch signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $VERSION_CODENAME stable

View file

@ -2,41 +2,6 @@
"storage-driver": "overlay2",
"ipv6": true,
"fixed-cidr-v6": "fd57:d7e4:f221::/64",
"experimental": true,
"ip6tables": true,
"userland-proxy": false,
"default-address-pools": [
{
"base": "172.17.0.0/16",
"size": 16
},
{
"base": "172.18.0.0/16",
"size": 16
},
{
"base": "172.19.0.0/16",
"size": 16
},
{
"base": "172.20.0.0/14",
"size": 16
},
{
"base": "172.24.0.0/14",
"size": 16
},
{
"base": "172.28.0.0/14",
"size": 16
},
{
"base": "fd57:d7e4:f221:1::/64",
"size": 64
},
{
"base": "fd57:d7e4:f221:2::/64",
"size": 64
}
]
"userland-proxy": true
}

View file

@ -1,5 +1,5 @@
mail_passwd="$mail_passwd"
function stalwart-cli()
{
(cd "$wd" && CREDENTIALS="admin:$mail_passwd" exec docker-compose -p server exec -T -e CREDENTIALS mail stalwart-cli -u "http://localhost" "$@")
(cd "$wd" && CREDENTIALS="admin:$mail_passwd" exec docker compose -p server exec -T -e CREDENTIALS mail stalwart-cli -u "http://localhost" "$@")
}