fix(docker): fix the dockerfile for the front and serve the apk at the good endpoint

Author: Ciznia

docker-compose.yml

@@ -16,14 +16,16 @@ services:
     build:
       context: .
       dockerfile: back/Dockerfile
+    networks:
+      - backToFront
     ports:
       - "8080:8080"
     working_dir: /app
 
   client_web:
     build:
-      context: .
-      dockerfile: front/Dockerfile
+      context: front
+      dockerfile: ./Dockerfile
     depends_on:
       server:
         condition: service_started
@@ -32,9 +34,9 @@ services:
     networks:
       - backToFront
     ports:
-      - "8081:8081"
+      - "8081:80"
     volumes:
-      - ./shared-artifacts:/app/share/www
+      - shared-artifacts:/shared/:ro
 
 volumes:
   shared-artifacts:

flake.nix

@@ -141,7 +141,6 @@
 
     packages = forAllSystems (pkgs: {
       back = pkgs.callPackage ./back {};
-      front = pkgs.callPackage ./front {};
     });
   };
 }

front/Dockerfile

@@ -1,27 +1,33 @@
-# Nix builder
-FROM nixos/nix:latest AS builder
+FROM node:22-bookworm-slim AS build
 
-# Copy our source and setup our working dir.
-COPY .. /tmp/build
-WORKDIR /tmp/build
+ENV DEBIAN_FRONTEND=noninteractive
 
-# Build our Nix environment (front-web helper)
-RUN nix \
-    --extra-experimental-features "nix-command flakes" \
-    --option filter-syscalls false \
-    build .#front
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    curl \
+    ca-certificates && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
-# Copy the Nix store closure into a directory.
-RUN mkdir /tmp/nix-store-closure
-RUN cp -R $(nix-store -qR result/) /tmp/nix-store-closure
+RUN corepack enable && corepack prepare pnpm@latest --activate
 
-# Final image is based on scratch.
-FROM scratch
+RUN npm install -g serve
 
-# Copy /nix/store and the built result
-COPY --from=builder /tmp/nix-store-closure /nix/store
-COPY --from=builder /tmp/build/result /app
+WORKDIR /app
 
-# Expose client_web port and run
-EXPOSE 8081
-CMD ["/app/bin/web"]
+COPY package.json pnpm-lock.yaml ./
+
+ENV CI=true
+RUN pnpm install --frozen-lockfile
+
+COPY . .
+
+RUN pnpm build:web
+
+FROM nginx:alpine
+COPY --from=build /app/dist /usr/share/nginx/html
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+# Expose to 80 and remap it in compose since nginx defaults to 80 without parameters possible
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]

front/default.nix

@@ -0,0 +1,19 @@
+server {
+    listen 80;
+
+    root /usr/share/nginx/html;
+    index index.html;
+
+    location / {
+        try_files $uri /index.html =404;
+    }
+
+    location /client.apk {
+        alias /shared/client.apk;
+    }
+
+    location /shared/ {
+        alias /shared/;
+        autoindex on;
+    }
+}