Moved files around a bit

Author: Philipp Doerner

buildFiles/config/dockerStartScript.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# This file contains all commands that shall be run on the docker container on startup
+# openrc is there to allow rc-service to run. rc-service manages the nginx server and starts it
+# nimstoryfont is the name of the binary that is the webapplication
+openrc boot
+rc-service nginx start
+/nimstoryfont

config/nginx.conf buildFiles/config/nginx.conf

@@ -28,7 +28,7 @@ http {
     #tcp_nopush     on;
 
     #keepalive_timeout  0;
-    keepalive_timeout  65;
+    keepalive_timeout  600;
 
     #gzip  on;
 

buildFiles/config/nginx.service

@@ -0,0 +1,21 @@
+[Unit]
+Description=The nginx HTTP and reverse proxy server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/nginx.pid
+# Nginx will fail to start if /run/nginx.pid already exists but has the wrong
+# SELinux context. This might happen when running `nginx -t` from the cmdline.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1268621
+ExecStartPre=/usr/bin/rm -f /run/nginx.pid
+ExecStartPre=/usr/sbin/nginx -t -c /etc/nginx/nginx.conf
+ExecStart=/usr/sbin/nginx -c /etc/nginx/nginx.conf
+ExecReload=/bin/kill -s HUP $MAINPID
+KillSignal=SIGQUIT
+TimeoutStopSec=5
+KillMode=process
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

config/dockerStartScript.sh

@@ -2,8 +2,7 @@ FROM frolvlad/alpine-glibc
 
 # Install dependencies
 RUN apk update
-RUN apk add --no-cache nginx openrc
-RUN apk add --no-cache sqlite-libs
+RUN apk add --no-cache openrc nginx sqlite-libs
 
 # Expose Ports -- Mostly documentation for later
 #EXPOSE 80/tcp
@@ -12,8 +11,8 @@ RUN apk add --no-cache sqlite-libs
 
 # Copy necessary files
 COPY ./nimstoryfont .
-COPY ./config/nginx.conf /etc/nginx/nginx.conf
-COPY ./config/dockerSettings.json /settings.json
+COPY ./buildFiles/config/nginx.conf /etc/nginx/nginx.conf
+COPY ./buildFiles/config/dockerSettings.json /settings.json
 RUN chmod 777 /settings.json
 
 # Setup necessary directories
@@ -27,10 +26,10 @@ RUN mkdir /frontend
 # Mount external directories
 
 #Startup command
-COPY ./config/dockerStartScript.sh .
+COPY ./buildFiles/config/dockerStartScript.sh .
 RUN chmod +x /dockerStartScript.sh
 
-CMD ["/dockerStartScript.sh"]
+# CMD ["/dockerStartScript.sh"]
 
 ## https://www.tutorialspoint.com/how-do-i-get-into-a-docker-container-s-shell
 ## https://www.youtube.com/watch?v=SnSH8Ht3MIc