diff --git a/Makefile b/Makefile index 4f45263..ad1d2f7 100644 --- a/Makefile +++ b/Makefile @@ -62,11 +62,11 @@ FETCH_TARGETS += $(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz $(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: URL := https://github.com/libfuse/libfuse/archive/fuse-$(FUSE_VERSION).tar.gz $(SKIP_MD5SUM)$(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: MD5 := 5f7c1062def710d8b60343524a18cc82 -WEBSOCKETS_VERSION ?= 3.2.0 +WEBSOCKETS_VERSION ?= 4.0.1 DOCKER_BUILDARGS += WEBSOCKETS_VERSION=$(WEBSOCKETS_VERSION) FETCH_TARGETS += $(FETCHDIR)/libwebsockets-$(WEBSOCKETS_VERSION).tar.gz $(FETCHDIR)/libwebsockets-$(WEBSOCKETS_VERSION).tar.gz: URL := https://github.com/warmcat/libwebsockets/archive/v$(WEBSOCKETS_VERSION).tar.gz -$(SKIP_MD5SUM)$(FETCHDIR)/libwebsockets-$(WEBSOCKETS_VERSION).tar.gz: MD5 := 1d06f5602604e67e6f50cef9857c6b0c +$(SKIP_MD5SUM)$(FETCHDIR)/libwebsockets-$(WEBSOCKETS_VERSION).tar.gz: MD5 := b5f90b470f398abbcf66e4639ad0273a JANSSON_VERSION ?= 2.12 DOCKER_BUILDARGS += JANSSON_VERSION=$(JANSSON_VERSION) diff --git a/build/amd64-alpine-builder.dockerfile b/build/amd64-alpine-builder.dockerfile index 6bd7713..6de467a 100644 --- a/build/amd64-alpine-builder.dockerfile +++ b/build/amd64-alpine-builder.dockerfile @@ -67,9 +67,11 @@ RUN set -x \ && rm -rf "$builddir" \ && apk del .build-deps -ARG WEBSOCKETS_VERSION=3.2.0 +ARG WEBSOCKETS_VERSION=4.0.1 RUN set -x \ + && builddeps="linux-headers" \ + && apk add --no-cache --virtual .build-deps $builddeps \ && apk add --no-cache \ ca-certificates \ openssl \ @@ -79,7 +81,8 @@ RUN set -x \ && cd "$builddir" \ && cmake "/usr/local/src/libwebsockets-$WEBSOCKETS_VERSION" \ && make "$PARALLELMFLAGS" install \ - && rm -rf "$builddir" + && rm -rf "$builddir" \ + && apk del .build-deps ARG JANSSON_VERSION=2.12 diff --git a/build/amd64-ubuntu-builder.dockerfile b/build/amd64-ubuntu-builder.dockerfile index cbdc241..383de3a 100644 --- a/build/amd64-ubuntu-builder.dockerfile +++ b/build/amd64-ubuntu-builder.dockerfile @@ -65,7 +65,7 @@ RUN set -x \ && rm -rf "$builddir" \ && apt purge -y $builddeps -ARG WEBSOCKETS_VERSION=3.2.0 +ARG WEBSOCKETS_VERSION=4.0.1 RUN set -x \ && apt install --yes --no-install-recommends \ diff --git a/build/arm32v7-alpine-builder.dockerfile b/build/arm32v7-alpine-builder.dockerfile index 4eca9a6..2e7c5a3 100644 --- a/build/arm32v7-alpine-builder.dockerfile +++ b/build/arm32v7-alpine-builder.dockerfile @@ -71,9 +71,11 @@ RUN set -x \ && rm -rf "$builddir" \ && apk del .build-deps -ARG WEBSOCKETS_VERSION=3.2.0 +ARG WEBSOCKETS_VERSION=4.0.1 RUN set -x \ + && builddeps="linux-headers" \ + && apk add --no-cache --virtual .build-deps $builddeps \ && apk add --no-cache \ ca-certificates \ openssl \ @@ -83,7 +85,8 @@ RUN set -x \ && cd "$builddir" \ && cmake "/usr/local/src/libwebsockets-$WEBSOCKETS_VERSION" \ && make "$PARALLELMFLAGS" install \ - && rm -rf "$builddir" + && rm -rf "$builddir" \ + && apk del .build-deps ARG JANSSON_VERSION=2.12 diff --git a/build/arm32v7-ubuntu-builder.dockerfile b/build/arm32v7-ubuntu-builder.dockerfile index a9da298..08e3c7d 100644 --- a/build/arm32v7-ubuntu-builder.dockerfile +++ b/build/arm32v7-ubuntu-builder.dockerfile @@ -68,7 +68,7 @@ RUN set -x \ && rm -rf "$builddir" \ && apt purge -y $builddeps -ARG WEBSOCKETS_VERSION=3.2.0 +ARG WEBSOCKETS_VERSION=4.0.1 RUN set -x \ && apt install --yes --no-install-recommends \ diff --git a/doc/build.md b/doc/build.md index fe16a11..6adb6f2 100644 --- a/doc/build.md +++ b/doc/build.md @@ -58,9 +58,9 @@ To install libfuse, meson is needed. Please refer to [meson quick guide](https:/ #### libwebsockets - wget -O libwebsockets-3.2.0.tar.gz https://github.com/warmcat/libwebsockets/archive/v3.2.0.tar.gz - tar -xf libwebsockets-3.2.0.tar.gz - cd libwebsockets-3.2.0 + wget -O libwebsockets-4.0.1.tar.gz https://github.com/warmcat/libwebsockets/archive/v4.0.1.tar.gz + tar -xf libwebsockets-4.0.1.tar.gz + cd libwebsockets-4.0.1 mkdir .build cd .build cmake ..