paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Update] Do not try to prefetch ipv6nat if migrated to native NAT, fixes #4218; Skip native NAT migration if IPv6 disabled;

master
andryyy 2021-08-10 09:00:55 +02:00
parent e30a8efb0f
commit f5b709c776
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
update.sh
View File

@ -62,6 +62,11 @@ prefetch_images() {
[[ -z ${BRANCH} ]] && { echo -e "\e[33m\nUnknown branch...\e[0m"; exit 1; } [[ -z ${BRANCH} ]] && { echo -e "\e[33m\nUnknown branch...\e[0m"; exit 1; }
git fetch origin #${BRANCH} git fetch origin #${BRANCH}
while read image; do while read image; do
if [[ "${image}" == "robbertkl/ipv6nat" ]]; then
if ! grep -qi "ipv6nat-mailcow" docker-compose.yml || grep -qi "enable_ipv6: false" docker-compose.yml; then
continue
fi
fi
RET_C=0 RET_C=0
until docker pull ${image}; do until docker pull ${image}; do
RET_C=$((RET_C + 1)) RET_C=$((RET_C + 1))
@ -134,7 +139,7 @@ migrate_docker_nat() {
DOCKERV_REQ=20.10.2 DOCKERV_REQ=20.10.2
# Current Docker version # Current Docker version
DOCKERV_CUR=$(docker version -f '{{.Server.Version}}') DOCKERV_CUR=$(docker version -f '{{.Server.Version}}')
if grep -qi "ipv6nat-mailcow" docker-compose.yml; then if grep -qi "ipv6nat-mailcow" docker-compose.yml && grep -qi "enable_ipv6: true" docker-compose.yml; then
echo -e "\e[32mNative IPv6 implementation available.\e[0m" echo -e "\e[32mNative IPv6 implementation available.\e[0m"
echo "This will enable experimental features in the Docker daemon and configure Docker to do the IPv6 NATing instead of ipv6nat-mailcow." echo "This will enable experimental features in the Docker daemon and configure Docker to do the IPv6 NATing instead of ipv6nat-mailcow."
echo '!!! This step is recommended !!!' echo '!!! This step is recommended !!!'