Merge pull request #1582 from dodona-edu/fix/docker-compose-web

Fix dolos-web Docker image not using the environment variables correctly

Author: rien

api/shell.nix

@@ -2,7 +2,7 @@
 let
   dev = fetchTarball "https://github.com/numtide/devshell/archive/main.tar.gz";
   devshell = pkgs.devshell or (import dev { inherit system; });
-  ruby = pkgs.ruby_3_2;
+  ruby = pkgs.ruby_3_3;
 in
 devshell.mkShell {
   name = "Dolos API server";

docker-compose.yml

@@ -1,6 +1,4 @@
-
 name: dolos
-version: "3.9"
 services:
   db:
     image: mariadb:11

flake.lock

@@ -12,7 +12,6 @@
       url = "github:numtide/devshell";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
       };
     };
   };

flake.nix

@@ -1,4 +1,4 @@
-FROM node:22.2.0-alpine3.19
+FROM node:22.8.0-alpine3.19
 
 WORKDIR /web/
 
@@ -10,10 +10,11 @@ RUN npm install && apk add --no-cache curl
 
 ENV VITE_HOST=0.0.0.0
 ENV VITE_PORT=8080
-ENV VITE_API_URL=http://localhost:3000
 ENV VITE_MODE=server
+ENV DEFAULT_VITE_API_URL=http://localhost:3000
 EXPOSE 8080/tcp
 
-RUN npm run build
+RUN VITE_API_URL="$DEFAULT_VITE_API_URL" npm run build
 
-CMD npm run preview -- --host "$VITE_HOST" --port "$VITE_PORT" --strictPort
+
+CMD (test "$VITE_API_URL" == "$DEFAULT_VITE_API_URL" || npm run build) && npm run preview -- --host "$VITE_HOST" --port "$VITE_PORT" --strictPort

web/Dockerfile

@@ -281,9 +281,7 @@ const similarities = computed(() =>
 
 // Average maximum similarity.
 const averageSimilarity = computed(() => {
-  const mean =
-    similarities.value.reduce((a, b) => a + b, 0) / similarities.value.length ??
-    0;
+  const mean = similarities.value.reduce((a, b) => a + b, 0) / similarities.value.length;
   return isNaN(mean) ? 0 : mean;
 });