From 9a748ac9032f470c5c7ca55847699150551b67d7 Mon Sep 17 00:00:00 2001
From: Armin <armin.co@hs-bochum.de>
Date: Mon, 15 Jun 2020 16:52:33 +0200
Subject: [PATCH] Added nginx container

---
 build_mumble_web.sh        | 5 +++--
 webserver/Dockerfile.nginx | 8 ++++++--
 webserver/conf/nginx.conf  | 4 ++--
 webserver/entrypoint.sh    | 5 +----
 4 files changed, 12 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 webserver/entrypoint.sh

diff --git a/build_mumble_web.sh b/build_mumble_web.sh
index b4dd765..66a83ee 100755
--- a/build_mumble_web.sh
+++ b/build_mumble_web.sh
@@ -38,7 +38,7 @@ verify_commit_HEAD
 
 # build docker image 
 printf "\nBuilding image\n"
-docker build -t $IMAGE_NAME . > build.log
+docker build -t $IMAGE_NAME -f Dockerfile.mumble-web . > build.log
 # create temporary container
 docker create --name $CONTAINER_NAME "${IMAGE_NAME}"
 # remove previously copied files
@@ -56,5 +56,6 @@ fi
 
 if [ $RUN_TEST == "true" ]
 then
-    docker run --rm -d -p 443:443 --name mumble-web-nginx-test $IMAGE_NAME
+    docker build -t "${IMAGE_NAME}_nginx" -f webserver/Dockerfile.nginx .
+    docker run --rm -d -p 443:443 --name "${CONTAINER_NAME}_nginx" "${IMAGE_NAME}_nginx"
 fi
\ No newline at end of file
diff --git a/webserver/Dockerfile.nginx b/webserver/Dockerfile.nginx
index 1aebde1..2ee8df8 100644
--- a/webserver/Dockerfile.nginx
+++ b/webserver/Dockerfile.nginx
@@ -2,10 +2,14 @@ FROM build_mumble_web_image
 
 USER root
 
-RUN apk add --no-cache nginx && \
+RUN apk add --no-cache bash nginx && \
     adduser -D -g 'www' www && \
     mkdir /config
 
 EXPOSE 443
+COPY webserver/entrypoint.sh /
+COPY webserver/ /config
 
-CMD ./config/entrypoint.sh
\ No newline at end of file
+
+RUN chmod +x /entrypoint.sh
+CMD /bin/bash ./entrypoint.sh
\ No newline at end of file
diff --git a/webserver/conf/nginx.conf b/webserver/conf/nginx.conf
index 2f17e8c..754b765 100644
--- a/webserver/conf/nginx.conf
+++ b/webserver/conf/nginx.conf
@@ -17,8 +17,8 @@ http {
     server {
         listen 443 ssl;
         server_name localhost;
-        ssl_certificate /home/node/test.crt;
-        ssl_certificate_key /home/node/test.key;
+        ssl_certificate /config/certs/test.crt;
+        ssl_certificate_key /config/certs/test.key;
 
         location / {
             root /home/node/dist;
diff --git a/webserver/entrypoint.sh b/webserver/entrypoint.sh
old mode 100644
new mode 100755
index f17ddb9..5459c70
--- a/webserver/entrypoint.sh
+++ b/webserver/entrypoint.sh
@@ -1,5 +1,2 @@
-#!bin/bash
-
-mv /config/nginx.conf /etc/nginx/nginx.conf
-
+mv /config/conf/nginx.conf /etc/nginx/nginx.conf;
 nginx -g 'daemon off;'; nginx -s reload;
\ No newline at end of file
-- 
GitLab