kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(build) rename makefile to makefile.dev to ease cmake BuildExternal (fix #261)

Browse Source
This commit is contained in:
Benjamin Sergeant 2020-12-22 21:42:39 -08:00
parent 461a645704
commit 1d0432c8c5
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -2,3 +2,4 @@ build
CMakeCache.txt CMakeCache.txt
ws/CMakeCache.txt ws/CMakeCache.txt
test/build test/build
makefile

2
docker/Dockerfile.alpine
View File

@ -15,7 +15,7 @@ COPY --chown=app:app . /opt
WORKDIR /opt WORKDIR /opt
USER app USER app
RUN make ws_mbedtls_install && \ RUN make -f makefile.dev ws_mbedtls_install && \
sh tools/trim_repo_for_docker.sh sh tools/trim_repo_for_docker.sh
FROM alpine:3.12 as runtime FROM alpine:3.12 as runtime

4
docs/CHANGELOG.md
View File

@ -2,6 +2,10 @@
All changes to this project will be documented in this file. All changes to this project will be documented in this file.
## [11.0.6] - 2020-12-22
(build) rename makefile to makefile.dev to ease cmake BuildExternal (fix #261)
## [11.0.5] - 2020-12-17 ## [11.0.5] - 2020-12-17
(ws) Implement simple header based websocket authorization technique to reject (ws) Implement simple header based websocket authorization technique to reject

2
ixwebsocket/IXWebSocketVersion.h
View File

@ -6,4 +6,4 @@
#pragma once #pragma once
#define IX_WEBSOCKET_VERSION "11.0.5" #define IX_WEBSOCKET_VERSION "11.0.6"

0
makefile → makefile.dev
View File