From 87cba17715103e2409c729aef4445f31a1b71c66 Mon Sep 17 00:00:00 2001 From: Tom Parker Date: Thu, 15 Jul 2021 19:49:35 +0000 Subject: [PATCH] Disable HTTP2 when building libwebsockets for docker images. Works around #1211. Signed-off-by: Tom Parker --- docker/1.5-openssl/Dockerfile | 1 + docker/1.5/Dockerfile | 1 + docker/1.6-openssl/Dockerfile | 1 + docker/1.6/Dockerfile | 1 + docker/2.0-openssl/Dockerfile | 1 + docker/2.0/Dockerfile | 1 + docker/generic/Dockerfile | 1 + docker/local/Dockerfile | 1 + 8 files changed, 8 insertions(+) diff --git a/docker/1.5-openssl/Dockerfile b/docker/1.5-openssl/Dockerfile index 996e69e4..c4e0a3f7 100644 --- a/docker/1.5-openssl/Dockerfile +++ b/docker/1.5-openssl/Dockerfile @@ -28,6 +28,7 @@ RUN set -x && \ -DLWS_WITHOUT_CLIENT=ON \ -DLWS_WITHOUT_EXTENSIONS=ON \ -DLWS_WITHOUT_TESTAPPS=ON \ + -DLWS_WITH_HTTP2=OFF \ -DLWS_WITH_SHARED=OFF \ -DLWS_WITH_ZIP_FOPS=OFF \ -DLWS_WITH_ZLIB=OFF && \ diff --git a/docker/1.5/Dockerfile b/docker/1.5/Dockerfile index 612bd2cc..b64fa495 100644 --- a/docker/1.5/Dockerfile +++ b/docker/1.5/Dockerfile @@ -30,6 +30,7 @@ RUN set -x && \ -DLWS_WITHOUT_CLIENT=ON \ -DLWS_WITHOUT_EXTENSIONS=ON \ -DLWS_WITHOUT_TESTAPPS=ON \ + -DLWS_WITH_HTTP2=OFF \ -DLWS_WITH_SHARED=OFF \ -DLWS_WITH_ZIP_FOPS=OFF \ -DLWS_WITH_ZLIB=OFF && \ diff --git a/docker/1.6-openssl/Dockerfile b/docker/1.6-openssl/Dockerfile index ff6b729e..070e3a00 100644 --- a/docker/1.6-openssl/Dockerfile +++ b/docker/1.6-openssl/Dockerfile @@ -33,6 +33,7 @@ RUN set -x && \ -DLWS_WITHOUT_EXTENSIONS=ON \ -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITH_EXTERNAL_POLL=ON \ + -DLWS_WITH_HTTP2=OFF \ -DLWS_WITH_SHARED=OFF \ -DLWS_WITH_ZIP_FOPS=OFF \ -DLWS_WITH_ZLIB=OFF && \ diff --git a/docker/1.6/Dockerfile b/docker/1.6/Dockerfile index 46231c8e..58ecda9a 100644 --- a/docker/1.6/Dockerfile +++ b/docker/1.6/Dockerfile @@ -33,6 +33,7 @@ RUN set -x && \ -DLWS_WITHOUT_EXTENSIONS=ON \ -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITH_EXTERNAL_POLL=ON \ + -DLWS_WITH_HTTP2=OFF \ -DLWS_WITH_SHARED=OFF \ -DLWS_WITH_ZIP_FOPS=OFF \ -DLWS_WITH_ZLIB=OFF && \ diff --git a/docker/2.0-openssl/Dockerfile b/docker/2.0-openssl/Dockerfile index 841878bd..8d335360 100644 --- a/docker/2.0-openssl/Dockerfile +++ b/docker/2.0-openssl/Dockerfile @@ -35,6 +35,7 @@ RUN set -x && \ -DLWS_WITHOUT_EXTENSIONS=ON \ -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITH_EXTERNAL_POLL=ON \ + -DLWS_WITH_HTTP2=OFF \ -DLWS_WITH_SHARED=OFF \ -DLWS_WITH_ZIP_FOPS=OFF \ -DLWS_WITH_ZLIB=OFF && \ diff --git a/docker/2.0/Dockerfile b/docker/2.0/Dockerfile index f08e6dfe..0a08be3e 100644 --- a/docker/2.0/Dockerfile +++ b/docker/2.0/Dockerfile @@ -35,6 +35,7 @@ RUN set -x && \ -DLWS_WITHOUT_EXTENSIONS=ON \ -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITH_EXTERNAL_POLL=ON \ + -DLWS_WITH_HTTP2=OFF \ -DLWS_WITH_SHARED=OFF \ -DLWS_WITH_ZIP_FOPS=OFF \ -DLWS_WITH_ZLIB=OFF && \ diff --git a/docker/generic/Dockerfile b/docker/generic/Dockerfile index 81c1a37e..5516b1fb 100644 --- a/docker/generic/Dockerfile +++ b/docker/generic/Dockerfile @@ -37,6 +37,7 @@ RUN set -x && \ -DLWS_WITHOUT_EXTENSIONS=ON \ -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITH_EXTERNAL_POLL=ON \ + -DLWS_WITH_HTTP2=OFF \ -DLWS_WITH_SHARED=OFF \ -DLWS_WITH_ZIP_FOPS=OFF \ -DLWS_WITH_ZLIB=OFF && \ diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index bed389d0..02b603d9 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -31,6 +31,7 @@ RUN set -x && \ -DLWS_WITHOUT_EXTENSIONS=ON \ -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITH_EXTERNAL_POLL=ON \ + -DLWS_WITH_HTTP2=OFF \ -DLWS_WITH_SHARED=OFF \ -DLWS_WITH_ZIP_FOPS=OFF \ -DLWS_WITH_ZLIB=OFF && \