From a3048d7cb334cbb50f4cd8098a85bb34af303adc Mon Sep 17 00:00:00 2001
From: Guntis Smaukstelis <gsmaukstelis@evolution.com>
Date: Sun, 2 Mar 2025 22:03:27 +0200
Subject: [PATCH] Scala depends on node

---
 Dockerfile.local   | 3 ---
 README.md          | 3 +--
 docker-compose.yml | 6 ++++--
 web/src/App.tsx    | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Dockerfile.local b/Dockerfile.local
index 2e837c4..b495580 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -7,9 +7,6 @@ RUN sbt clean assembly
 
 FROM amazoncorretto:17-alpine
 
-COPY --from=build /app/web/dist/ /web/dist/
 COPY --from=build /app/target/scala-2.13/app.jar /app.jar
 
-VOLUME /data
-
 CMD ["java", "-jar", "app.jar"]
diff --git a/README.md b/README.md
index 0970bd5..72986c6 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,7 @@ Rename `.env-sample` to `.env` and fill in credentials
 
 ## Run
 ```
-docker-compose up --build node
-docker-compose up --build scala
+docker-compose up --build
 ```
 
 ## Web
diff --git a/docker-compose.yml b/docker-compose.yml
index a282507..f1f1af8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,9 @@
 services:
   node:
     image: node:22.14.0
-    working_dir: /app/web
+    working_dir: /web
     volumes:
-      - ./web:/app/web
+      - ./web:/web
     command: sh -c "npm install && npm run build"
 
   postgres:
@@ -40,9 +40,11 @@ services:
       dockerfile: Dockerfile.local
     volumes:
       - scala-data:/data
+      - ./web/dist:/web/dist
     ports:
       - "9090:8080"
     depends_on:
+      - node
       - postgres
 
 volumes:
diff --git a/web/src/App.tsx b/web/src/App.tsx
index 4449bd9..300d86f 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -10,8 +10,8 @@ import { apiHost } from './consts';
 import { WeatherIconStub } from './components/weatherIcons/WeatherIconStub';
 import { Harmonie } from './harmonie/Harmonie'
 
-console.log("env:", import.meta.env.MODE);
-console.log("api host:", apiHost);
+console.log("env:", import.meta.env.MODE)
+console.log("api host:", apiHost)
 
 const App: Component = () => {
     const pages = ['station', 'cities', 'latvia', 'database', 'harmonie']