From 9f51a54a83319b8b27c44fdba8a912078edceb46 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Fri, 4 Sep 2020 13:47:12 -0700 Subject: [PATCH] (docker) ws docker file installs strace --- docker/Dockerfile.alpine | 2 +- docs/CHANGELOG.md | 4 ++++ ixwebsocket/IXWebSocketVersion.h | 2 +- ws/ws.cpp | 9 ++------- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 2ac39ff9..c97e3926 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -20,7 +20,7 @@ RUN make ws_mbedtls_install && \ FROM alpine:3.12 as runtime -RUN apk add --no-cache libstdc++ mbedtls ca-certificates python3 && \ +RUN apk add --no-cache libstdc++ mbedtls ca-certificates python3 strace && \ addgroup -S app && \ adduser -S -G app app diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index f9f4ace2..f2ecbe1a 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,6 +2,10 @@ All changes to this project will be documented in this file. +## [10.3.4] - 2020-09-04 + +(docker) ws docker file installs strace + ## [10.3.3] - 2020-09-02 (ws) echo_client command renamed to autoroute. Command exit once the server close the connection. push_server commands exit once N messages have been sent. diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h index d4442159..61df79cb 100644 --- a/ixwebsocket/IXWebSocketVersion.h +++ b/ixwebsocket/IXWebSocketVersion.h @@ -6,4 +6,4 @@ #pragma once -#define IX_WEBSOCKET_VERSION "10.3.3" +#define IX_WEBSOCKET_VERSION "10.3.4" diff --git a/ws/ws.cpp b/ws/ws.cpp index 06bfd89f..7caa3481 100644 --- a/ws/ws.cpp +++ b/ws/ws.cpp @@ -3308,13 +3308,8 @@ int main(int argc, char** argv) } else if (app.got_subcommand("push_server")) { - ret = ix::ws_push_server(port, - hostname, - tlsOptions, - ipv6, - disablePerMessageDeflate, - disablePong, - sendMsg); + ret = ix::ws_push_server( + port, hostname, tlsOptions, ipv6, disablePerMessageDeflate, disablePong, sendMsg); } else if (app.got_subcommand("transfer")) {