]> jfr.im git - irc/znc/znc.git/commitdiff
Re-enable IPv6 in the bleeding edge docker image
authorAlexey Sokolov <redacted>
Thu, 17 Oct 2019 21:20:15 +0000 (22:20 +0100)
committerAlexey Sokolov <redacted>
Thu, 17 Oct 2019 21:20:15 +0000 (22:20 +0100)
Upgrade alpine

Ref https://github.com/znc/znc-docker/issues/19

Dockerfile
docker

index 0cdcf21e95175cbe9333595fd647ac3d0d3162c5..57902582bcd8b963831858b6920804d581f5bf5a 100644 (file)
@@ -1,10 +1,8 @@
-FROM alpine:3.8
+FROM alpine:3.10
 
 ARG VERSION_EXTRA=""
 
-# musl silently doesn't support AI_ADDRCONFIG yet, and ZNC doesn't support Happy Eyeballs yet.
-# Together they cause very slow connection. So for now IPv6 is disabled here.
-ARG CMAKEFLAGS="-DVERSION_EXTRA=${VERSION_EXTRA} -DCMAKE_INSTALL_PREFIX=/opt/znc -DWANT_CYRUS=YES -DWANT_PERL=YES -DWANT_PYTHON=YES -DWANT_IPV6=NO"
+ARG CMAKEFLAGS="-DVERSION_EXTRA=${VERSION_EXTRA} -DCMAKE_INSTALL_PREFIX=/opt/znc -DWANT_CYRUS=YES -DWANT_PERL=YES -DWANT_PYTHON=YES"
 ARG MAKEFLAGS=""
 
 ARG BUILD_DATE
diff --git a/docker b/docker
index 4da25330d7d4415507c5abd24efa74130243a5b3..95e45def730df4a04c0d08a97dccb66e5b9766f6 160000 (submodule)
--- a/docker
+++ b/docker
@@ -1 +1 @@
-Subproject commit 4da25330d7d4415507c5abd24efa74130243a5b3
+Subproject commit 95e45def730df4a04c0d08a97dccb66e5b9766f6