From e8f81776f96f8cd0a4a744f9950582e91c27bc82 Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <bsergean@gmail.com>
Date: Mon, 16 Mar 2020 10:05:21 -0700
Subject: [PATCH] (cobra to sentry bot + docker) default docker file uses
 mbedtls + ws cobra_to_sentry pass tls options to sentryClient.

---
 docker/Dockerfile.centos         | 8 +++++++-
 docs/CHANGELOG.md                | 4 ++++
 ixwebsocket/IXWebSocketVersion.h | 2 +-
 makefile                         | 3 +++
 ws/ws.cpp                        | 1 +
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos
index abdb4b4d..7067ed9a 100644
--- a/docker/Dockerfile.centos
+++ b/docker/Dockerfile.centos
@@ -2,6 +2,9 @@ FROM centos:8 as build
 
 RUN yum install -y gcc-c++ make cmake zlib-devel openssl-devel redhat-rpm-config 
 
+RUN yum install -y epel-release
+RUN yum install -y mbedtls-devel
+
 RUN groupadd app && useradd -g app app
 RUN chown -R app:app /opt
 RUN chown -R app:app /usr/local
@@ -12,13 +15,16 @@ COPY --chown=app:app . /opt
 WORKDIR /opt
 
 USER app
-RUN [ "make", "ws_install" ]
+RUN [ "make", "ws_mbedtls_install" ]
 RUN [ "rm", "-rf", "build" ]
 
 FROM centos:8 as runtime
 
 RUN yum install -y gdb strace
 
+RUN yum install -y epel-release
+RUN yum install -y mbedtls
+
 RUN groupadd app && useradd -g app app
 COPY --chown=app:app --from=build /usr/local/bin/ws /usr/local/bin/ws
 RUN chmod +x /usr/local/bin/ws
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 7697dba1..c20f49dd 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All changes to this project will be documented in this file.
 
+## [8.2.6] - 2020-03-16
+
+(cobra to sentry bot + docker) default docker file uses mbedtls + ws cobra_to_sentry pass tls options to sentryClient.
+
 ## [8.2.5] - 2020-03-13
 
 (cobra client) ws cobra subscribe resubscribe at latest position after being disconnected
diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h
index b50e9c51..1fefa1ba 100644
--- a/ixwebsocket/IXWebSocketVersion.h
+++ b/ixwebsocket/IXWebSocketVersion.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "8.2.5"
+#define IX_WEBSOCKET_VERSION "8.2.6"
diff --git a/makefile b/makefile
index d9f23fd5..fbefee77 100644
--- a/makefile
+++ b/makefile
@@ -23,6 +23,9 @@ ws_openssl:
 ws_mbedtls:
 	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; make -j 4)
 
+ws_mbedtls_install:
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; make -j 4 install)
+
 ws_no_ssl:
 	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_WS=1 .. ; make -j 4)
 
diff --git a/ws/ws.cpp b/ws/ws.cpp
index a32d7dd9..638e714c 100644
--- a/ws/ws.cpp
+++ b/ws/ws.cpp
@@ -454,6 +454,7 @@ int main(int argc, char** argv)
         bool enableHeartbeat = true;
         int runtime = -1;
         ix::SentryClient sentryClient(dsn);
+        sentryClient.setTLSOptions(tlsOptions);
 
         ret = ix::cobra_to_sentry_bot(cobraConfig,
                                       channel,