Merge remote-tracking branch 'origin/master'

CMakeLists.txt

@@ -26,7 +26,8 @@ add_library(chttp SHARED
         src/chttp/RequestHandler.cpp
         src/chttp/Router.cpp
         src/chttp/Server.cpp
-        include/chttp/data/Cookie.hpp)
+        include/chttp/data/Cookie.hpp
+        include/chttp/util/CHttpError.hpp)
 
 target_include_directories(chttp PRIVATE include)
 target_include_directories(chttp PRIVATE include/chttp)

Dockerfile

@@ -1,12 +1,18 @@
 FROM alpine
+
 COPY . /server
 WORKDIR server
-RUN ls
-RUN apk add cmake make g++ nodejs npm
+# Change some enviorment vars to make sure the build will be sucssesful
 ENV LD_LIBRARY_PATH=/usr/local/lib64
+ENV NODE_ENV=production
+# install the tools required for compilation
+RUN apk add cmake make g++ nodejs npm
+# build CHttp
 RUN mkdir build && cd build && cmake .. && make && make install
+# Build the example site - the server
 RUN mkdir examples/build && cd examples/build && cmake .. && make
+# install the front-end deps and build the front end
 RUN cd examples/client && npm install && npm run-script build
+# Run the example server
 WORKDIR examples/build
 CMD ["./examples"]
-EXPOSE 80

examples/CMakeLists.txt

@@ -8,6 +8,7 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/thirdparty/SQLiteCpp)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/thirdparty/SQLiteCpp/include)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/thirdparty/json)
 include_directories(${chttp_INCLUDE_DIRS})
+include_directories(../include)
 
 add_executable(examples main.cpp)