From 260fa9a5a285c2bcb5ca5214aa647cd6edf93384 Mon Sep 17 00:00:00 2001
From: Anis Koubaa <mohamed.koubaa@kit.edu>
Date: Tue, 4 Mar 2025 16:43:59 +0100
Subject: [PATCH] make both docker running.
---
docker-compose.yml | 7 +++----
services/backend_regimo/Dockerfile | 3 ++-
services/frontend/Dockerfile | 16 ++++++++++++----
services/frontend/package.json | 2 +-
.../src/app/shared/components/HelloWorld.vue | 2 +-
services/frontend/vite.config.mjs | 2 +-
6 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 48bf913..192ba6a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,8 +12,7 @@ services:
frontend:
build: ./services/frontend
- volumes:
- - './services/frontend:/app'
- - '/app/node_modules'
ports:
- - "3000:3000"
\ No newline at end of file
+ - "8080:8080"
+ volumes:
+ - ./services/frontend/src:/app/src
\ No newline at end of file
diff --git a/services/backend_regimo/Dockerfile b/services/backend_regimo/Dockerfile
index 80ad4f9..73a6ed0 100644
--- a/services/backend_regimo/Dockerfile
+++ b/services/backend_regimo/Dockerfile
@@ -1,6 +1,5 @@
FROM python:3.10-alpine
-RUN mkdir app
WORKDIR /app
ENV PATH="${PATH}:/root/.local/bin"
@@ -11,3 +10,5 @@ RUN pip install --upgrade pip
RUN pip install -r requirements.txt
COPY src/ .
+
+CMD ["uvicorn", "main:app", "--reload", "--host", "0.0.0.0", "--port", "8000"]
diff --git a/services/frontend/Dockerfile b/services/frontend/Dockerfile
index 19c4343..03711c6 100644
--- a/services/frontend/Dockerfile
+++ b/services/frontend/Dockerfile
@@ -1,13 +1,21 @@
FROM node:lts-alpine
-RUN mkdir app
+# Set the working directory
WORKDIR /app
-ENV PATH /app/node_modules/.bin:$PATH
-
RUN npm install -g npm@11.1.0
-COPY package.json .
+# Copy package.json
+COPY package.json ./
+
+# Install dependencies
RUN npm install
+# Copy the rest of the application code
+COPY . .
+
+# Expose the application port
+EXPOSE 8080
+
+# Start the application
CMD ["npm", "run", "dev"]
\ No newline at end of file
diff --git a/services/frontend/package.json b/services/frontend/package.json
index 6a1b3cf..eb879cf 100644
--- a/services/frontend/package.json
+++ b/services/frontend/package.json
@@ -4,7 +4,7 @@
"type": "module",
"version": "0.1.0",
"scripts": {
- "dev": "vite",
+ "dev": "vite --host 0.0.0.0",
"build": "vite build",
"preview": "vite preview",
"lint": "eslint . --fix"
diff --git a/services/frontend/src/app/shared/components/HelloWorld.vue b/services/frontend/src/app/shared/components/HelloWorld.vue
index 2dffb38..5a08e5c 100644
--- a/services/frontend/src/app/shared/components/HelloWorld.vue
+++ b/services/frontend/src/app/shared/components/HelloWorld.vue
@@ -44,7 +44,7 @@
<template #subtitle>
<div class="text-subtitle-1">
- Replace this page by removing <v-kbd>{{ `<HelloWorld></HelloWorld>` }}</v-kbd> in <v-kbd>pages/index.vue</v-kbd>.
+ Please login to access.
</div>
</template>
diff --git a/services/frontend/vite.config.mjs b/services/frontend/vite.config.mjs
index 73375db..421ea7a 100644
--- a/services/frontend/vite.config.mjs
+++ b/services/frontend/vite.config.mjs
@@ -62,7 +62,7 @@ export default defineConfig({
],
},
server: {
- port: 3000,
+ port: 8080,
},
css: {
preprocessorOptions: {
--
GitLab