improve serving via docker, update version, make serve-docker

Dockerfile

@@ -5,7 +5,9 @@ LABEL org.opencontainers.image.url="https://www.ikna.io/"
 LABEL org.opencontainers.image.description="GraphSense's Web GUI for interactive cryptocurrency analysis written"
 LABEL org.opencontainers.image.source="https://github.com/graphsense/graphsense-dashboard"
 
-ENV DOCKER_USER=user
+ENV DOCKER_USER=dockeruser
+# override to get 
+ENV REST_URL=http://localhost:9000
 ARG DOCKER_UID=1000
 
 RUN addgroup -S $DOCKER_USER && adduser -S $DOCKER_USER -G $DOCKER_USER -u $DOCKER_UID
@@ -38,11 +40,13 @@ COPY ./generate.js $WORKDIR/generate.js
 RUN chown -R $DOCKER_USER $WORKDIR && \
     mkdir -p /usr/share/nginx/html /run/nginx && \
     chown -R $DOCKER_USER /usr/share/nginx/html && \
+    chown -R $DOCKER_USER /var/lib/nginx && \
+    chown -R $DOCKER_USER /var/log/nginx && \
     rm -f /etc/nginx/http.d/default.conf 
 
 USER $DOCKER_USER
 RUN npm install 
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["nginx", "-g", "daemon off;"]
-EXPOSE 8000
+CMD ["nginx", "-g", "pid /tmp/nginx.pid;daemon off;"]
+EXPOSE 8000

Makefile

@@ -30,9 +30,12 @@ build:
 	npm run build
 
 build-docker:
-	docker build .
+	docker build . -t graphsense-dashboard
+
+serve-docker: build-docker
+	docker run -it --network='host' -e REST_URL=http://localhost:9000 localhost/graphsense-dashboard:latest
 
 format:
 	npx elm-format --yes src
 
-.PHONY: openapi serve test format
+.PHONY: openapi serve test format build build-docker serve-docker

docker/site.conf

@@ -7,7 +7,8 @@ server {
     location = / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
-        try_files /index.html;
+        try_files /index.html /dev/null =404;
+    }
 
     location / {
         root   /usr/share/nginx/html;

src/Version.elm

@@ -3,4 +3,4 @@ module Version exposing (version)
 
 version : String
 version =
-    "23.12"
+    "24.01.0"