(ws commands) in websocket proxy, disable automatic reconnections + in Dockerfile, use alpine 3.11
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
				
			|||||||
FROM alpine:edge as build
 | 
					FROM alpine:3.11 as build
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN apk add --no-cache gcc g++ musl-dev linux-headers cmake openssl-dev 
 | 
					RUN apk add --no-cache gcc g++ musl-dev linux-headers cmake openssl-dev 
 | 
				
			||||||
RUN apk add --no-cache make
 | 
					RUN apk add --no-cache make
 | 
				
			||||||
@@ -16,7 +16,7 @@ WORKDIR /opt
 | 
				
			|||||||
USER app
 | 
					USER app
 | 
				
			||||||
RUN [ "make", "ws_install" ]
 | 
					RUN [ "make", "ws_install" ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FROM alpine:edge as runtime
 | 
					FROM alpine:3.11 as runtime
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN apk add --no-cache libstdc++
 | 
					RUN apk add --no-cache libstdc++
 | 
				
			||||||
RUN apk add --no-cache strace
 | 
					RUN apk add --no-cache strace
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,10 @@
 | 
				
			|||||||
# Changelog
 | 
					# Changelog
 | 
				
			||||||
All notable changes to this project will be documented in this file.
 | 
					All notable changes to this project will be documented in this file.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [7.6.1] - 2019-12-20
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(ws commands) in websocket proxy, disable automatic reconnections + in Dockerfile, use alpine 3.11
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## [7.6.0] - 2019-12-19
 | 
					## [7.6.0] - 2019-12-19
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(cobra) Add TLS options to all cobra commands and classes. Add example to the doc.
 | 
					(cobra) Add TLS options to all cobra commands and classes. Add example to the doc.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,4 +6,4 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define IX_WEBSOCKET_VERSION "7.5.8"
 | 
					#define IX_WEBSOCKET_VERSION "7.6.1"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -120,6 +120,7 @@ namespace ix
 | 
				
			|||||||
                    std::string url(remoteUrl);
 | 
					                    std::string url(remoteUrl);
 | 
				
			||||||
                    url += msg->openInfo.uri;
 | 
					                    url += msg->openInfo.uri;
 | 
				
			||||||
                    state->webSocket().setUrl(url);
 | 
					                    state->webSocket().setUrl(url);
 | 
				
			||||||
 | 
					                    state->webSocket().disableAutomaticReconnection();
 | 
				
			||||||
                    state->webSocket().start();
 | 
					                    state->webSocket().start();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    // we should sleep here for a bit until we've established the
 | 
					                    // we should sleep here for a bit until we've established the
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user