Deployment Ready.

Author: dterefe

DUUIRestService/Dockerfile

@@ -1,6 +1,6 @@
 # Verwenden Sie das offizielle OpenJDK 17 Image als Basis
 # FROM maven:3.8.5-openjdk-17
-FROM maven:3.9.4-eclipse-temurin-17
+FROM maven:3.9.4-eclipse-temurin-21
 
 # Setzen Sie das Arbeitsverzeichnis im Container
 WORKDIR /app

DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Methods.java

@@ -75,6 +75,13 @@ public static void init() {
             }
         });
 
+        path("/alive", () -> {
+            get("", (request, response) -> {
+                response.type("text/plain");
+                return "OK";
+            });
+        });
+
 
         path("/settings", () -> {
             before("/*", (request, response) -> {

DUUIRestService/src/main/resources/logback.xml

@@ -25,6 +25,8 @@
 <!--        </encoder>-->
 <!--    </appender>-->
 
+    <logger name="org.texttechnologylab.duui.api.controllers.users" level="TRACE"/>
+
     <!-- 3) Root logger: send everything ≥ INFO to console & file -->
     <root level="INFO">
         <appender-ref ref="CONSOLE" />

DUUIWeb/Dockerfile

@@ -1,8 +1,9 @@
 FROM node:18-alpine AS builder
 
 ARG API_URL
-ENV API_URL=http://duui-gateway-backend:2605
 ARG DBX_URL
+
+ENV API_URL=${API_URL}
 ENV DBX_URL=${DBX_URL}
 
 RUN mkdir /app
@@ -13,12 +14,16 @@ RUN cd /app && npm install && npm run build
 
 FROM node:18-alpine
 
+# Installiere Python sowie notwendige Build-Tools
+RUN apk add --no-cache python3 make g++
+
 RUN mkdir /app
 COPY --from=builder /app/build /app/build
 COPY --from=builder /app/package.json /app/
 
 RUN cd /app && \
-    npm install --omit=dev
+    npm install --omit=dev --ignore-scripts && \
+    npm rebuild bcrypt --build-from-source
 
 WORKDIR /app
 

DUUIWeb/src/hooks.server.ts

@@ -1,6 +1,29 @@
 import { API_URL } from '$env/static/private'
 import type { Handle, RequestEvent } from '@sveltejs/kit'
 
+
+async function testBackendConnection() {
+	try {
+		console.log('Trying to reach: ', API_URL)
+		const res = await fetch(`${API_URL}/alive`, {
+			method: 'GET'
+		});
+		if (res.ok) {
+			console.log('Backend reachable: ', API_URL)
+		} else {
+			console.error('Backend responds with: ', res.status)
+		}
+	} catch (error: any) {
+		if (error instanceof Error) {
+			console.error('Connecting to backend failed: ', error.toString(), error.stack);
+		} else {
+			console.error('Connecting to backend failed: ', error);
+		}
+	}
+}
+
+testBackendConnection()
+
 /**
  * Fetch a user from the databse to verify the user is authorized.
  *

DUUIWeb/src/routes/account/+page.svelte

@@ -1302,7 +1302,7 @@
 										{/each}
 									</div>
 								{:else}
-									{@html value}
+									<p class="p-4 break-words text-center">{value ?? ''}</p>
 								{/if}
 							</svelte:fragment>
 						</FunctionalTable2>
@@ -1402,7 +1402,8 @@
 									{/each}
 								</div>
 							{:else}
-								{@html value}
+								<p class="p-4 break-words text-center">{value ?? ''}</p>
+
 							{/if}
 						</svelte:fragment>
 					</FunctionalTable2>

docker-compose.yml

@@ -9,8 +9,7 @@ services:
     volumes:
       # Mount the Docker socket so the backend can start containers
       - /var/run/docker.sock:/var/run/docker.sock
-#      - /:/app/drives
-      - /home/:/app/drives
+      - /:/app/drives
     environment:
       - PORT=2605
       - HOST=duui-gateway-backend
@@ -32,22 +31,29 @@ services:
       - "host.docker.internal:host-gateway"
     depends_on:
       - mongodb
+    networks:
+      - app-network
 
 
-#  duui-frontend:
-#    build:
-#      context: ./DUUIWeb
-#      dockerfile: Dockerfile      # or Dockerfile-frontend, etc.
-#    container_name: duui-gateway-frontend
-#    ports:
-#      - "5173:5173"
-#    depends_on:
-#      - duui-backend
-#    environment:
-#      - ORIGIN=http://duui-gateway-frontend:5173
-#      - API_URL=http://duui-gateway-backend:2605
-#      - PORT=5173
-#      - DBX_URL='https://www.dropbox.com/home/Apps/DUUI'
+  duui-frontend:
+    build:
+      context: ./DUUIWeb
+      dockerfile: Dockerfile      # or Dockerfile-frontend, etc.
+      args:
+        API_URL: http://duui-gateway-backend:2605
+        DBX_URL: https://www.dropbox.com/home/Apps/DUUI
+    container_name: duui-gateway-frontend
+    ports:
+      - "5173:5173"
+    depends_on:
+      - duui-backend
+    environment:
+      - ORIGIN=http://duui-gateway-frontend:5173
+      - API_URL=http://duui-gateway-backend:2605
+      - PORT=5173
+      - DBX_URL='https://www.dropbox.com/home/Apps/DUUI'
+    networks:
+      - app-network
 
 
   mongodb:
@@ -62,4 +68,10 @@ services:
       - "27017:27017"
     volumes:
       - ./mongodb_data:/data/db
-      - ./init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js:ro
+      - ./init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js:ro
+    networks:
+      - app-network
+
+networks:
+    app-network:
+        driver: bridge