Merge branch '1.7.x'

This commit is contained in:
Alexey Sokolov
2019-10-17 22:21:50 +01:00
2 changed files with 3 additions and 5 deletions

View 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

2
docker

Submodule docker updated: 4da25330d7...95e45def73