From d39247a3b43bd51f19deffb3ac827d3a4f8134a3 Mon Sep 17 00:00:00 2001
From: Expand-sys <Expand@ur-mom.gay>
Date: Mon, 5 Jul 2021 13:37:21 +1000
Subject: [PATCH] dockerfile changes

---
 .dockerignore  |  4 +---
 .gitignore     |  3 ---
 CMakeLists.txt |  4 ++--
 Dockerfile     | 20 +++++++++++---------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 2501371..36bffe9 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,6 @@
 /build
-/config.json
-/users.json
 /help.md
 /services.md
 /APIs.md
 /README.md
-/benchmarking.cpp
\ No newline at end of file
+/benchmarking.cpp
diff --git a/.gitignore b/.gitignore
index 914e9bd..af96791 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
 .vscode
 build
-config.json
-users.json
-ccash_config.hpp
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57fdbaa..09f073b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,5 +85,5 @@ target_link_libraries(${PROJECT_NAME} PRIVATE drogon)
 target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_THREAD_LIBS_INIT} )
 target_link_libraries(${PROJECT_NAME} PRIVATE xxHash::xxhash)
 
-# AVX2_CFLAGS=-mavx2 SSSE3_CFLAGS=-mssse3 SSE41_CFLAGS=-msse4.1 SSE42_CFLAGS=-msse4.2 AVX_CFLAGS=-mavx make lib/libbase64.o
-target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/third_party/base64/lib/libbase64.o)
\ No newline at end of file
+#AVX2_CFLAGS=-mavx2 SSSE3_CFLAGS=-mssse3 SSE41_CFLAGS=-msse4.1 SSE42_CFLAGS=-msse4.2 AVX_CFLAGS=-mavx make lib/libbase64.o
+target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/third_party/base64/lib/libbase64.o)
diff --git a/Dockerfile b/Dockerfile
index c14cd74..9aabd40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,18 @@
-FROM debian:latest
+FROM alpine:3.11
 
-WORKDIR /ccash
+WORKDIR /CCash
 
-RUN apt update && apt -y install build-essential g++ cmake protobuf-compiler libjsoncpp-dev uuid-dev openssl libssl-dev zlib1g-dev
+RUN apk update && apk add cmake g++ make protobuf jsoncpp-dev openssl libressl-dev zlib-dev util-linux-dev libtool autoconf automake python3
 
 COPY . .
+RUN mkdir /CCash/build
+WORKDIR /CCash/build
+RUN cmake -DDROGON_CONFIG_LOC=\"\/CCash\/config\/config.json\" -DUSER_SAVE_LOC=\"\/CCash\/config\/users.json\" ..
+RUN make -j$(nproc)
 
-RUN mkdir build
+ARG ADMIN_A=admin
+ARG SAVE_FREQ=2
 
-WORKDIR /ccash/build
+RUN ["chmod", "+x", "/CCash/config/ssl.sh"]
 
-RUN cmake ..
-RUN make -j$(nprov)
-
-CMD ["/ccash/build/bank", "$CCASH_ADMIN_PASSWORD", "$CCASH_SAVE_FREQUENCY", "$CCASH_THREAD_COUNT"]
+CMD ["sh", "-c", "/CCash/config/ssl.sh && /CCash/build/bank ${ADMIN_A} ${SAVE_FREQ}"]