From b40e7f7368ed79eae8063a8237f9d4a891c6097c Mon Sep 17 00:00:00 2001 From: Natalie Rose Date: Sat, 5 Sep 2026 09:25:33 +1000 Subject: [PATCH] Docker bits --- docker/app/docker-compose.yml | 2 +- docker/docker-compose.dev.yml | 8 +++++++- docker/docker-compose.homelab.yml | 3 --- docker/docker-compose.test.yml | 3 --- docker/super-ui/docker-compose.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/app/docker-compose.yml b/docker/app/docker-compose.yml index ed019c8d..6a9c3b33 100644 --- a/docker/app/docker-compose.yml +++ b/docker/app/docker-compose.yml @@ -7,7 +7,7 @@ services: context: ./../../ dockerfile: ./docker/app/Dockerfile container_name: app - command: npx vite dev + command: '/bin/bash -c "npm ci && npx vite build"' volumes: - app-node_modules:/usr/src/app/node_modules - ./../../app:/usr/src/app diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index c1ada018..e95728db 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -4,11 +4,17 @@ include: - ./memcached/docker-compose.yml - ./mysql/docker-compose.yml - ./phpmyadmin/docker-compose.yml - - ./nginx/docker-compose.yml - ./super-ui/docker-compose.yml - ./v2-api/docker-compose.yml services: + nginx: + extends: + file: ./nginx/docker-compose.yml + service: nginx + ports: + - 3000:80 + server: extends: file: ./server/docker-compose.yml diff --git a/docker/docker-compose.homelab.yml b/docker/docker-compose.homelab.yml index 2e68a71c..f7454fdc 100644 --- a/docker/docker-compose.homelab.yml +++ b/docker/docker-compose.homelab.yml @@ -21,9 +21,6 @@ services: file: ./nginx/docker-compose.yml service: nginx network_mode: service:tailscale - # nginx has no network of its own under network_mode: service:*, so the - # inherited published port would be rejected at container create. - ports: !reset [] depends_on: tailscale: condition: service_healthy diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml index 2d72f99c..fff9597a 100644 --- a/docker/docker-compose.test.yml +++ b/docker/docker-compose.test.yml @@ -26,9 +26,6 @@ services: file: ./nginx/docker-compose.yml service: nginx network_mode: service:tailscale - # nginx has no network of its own under network_mode: service:*, so the - # inherited published port would be rejected at container create. - ports: !reset [] depends_on: tailscale: condition: service_healthy diff --git a/docker/super-ui/docker-compose.yml b/docker/super-ui/docker-compose.yml index 56ee6e5d..370ef06a 100644 --- a/docker/super-ui/docker-compose.yml +++ b/docker/super-ui/docker-compose.yml @@ -7,7 +7,7 @@ services: context: ./../../ dockerfile: ./docker/super-ui/Dockerfile container_name: super-ui - command: npm run build + command: '/bin/bash -c "npm ci --ignore-scripts && npm run build"' volumes: - super-ui-node_modules:/usr/src/app/node_modules - ./../../super-ui:/usr/src/app -- 2.54.0