fix: update Nginx configuration and Dockerfile paths for Vue application

.gitea/workflows/deploy.yml

@@ -12,8 +12,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Create .env file from Gitea secret
+        run: echo "${{ secrets.BACKEND_ENV }}" > backend/.env
+
       - name: Build and restart Docker containers
         run: |
-          docker-compose down
+          docker compose down
-          docker-compose build
+          docker compose build
-          docker-compose up -d
+          docker compose up -d

backend/Dockerfile

@@ -2,9 +2,9 @@ FROM python:3.12-slim
 
 WORKDIR /app
 
-COPY backend/requirements.txt /app/
+COPY requirements.txt /app/
 RUN pip install --no-cache-dir -r requirements.txt
 
-COPY backend /app
+COPY . /app
 
 CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]

docker-compose.yml

@@ -3,16 +3,16 @@ version: "3.9"
 services:
   backend:
     build:
-      context: .
+      context: ./backend
-      dockerfile: backend/Dockerfile
+      dockerfile: Dockerfile
-    container_name: my-backend
+    container_name: odoo-hours-backend
     restart: unless-stopped
 
   frontend:
     build:
-      context: .
+      context: ./frontend
-      dockerfile: frontend/Dockerfile
+      dockerfile: Dockerfile
-    container_name: my-frontend
+    container_name: odoo-hours-frontend
     ports:
       - "6080:80"
     restart: unless-stopped

frontend/Dockerfile

@@ -1,14 +1,14 @@
 # Etap 1: Build Vue
 FROM node:20 AS build
 WORKDIR /app
-COPY frontend/package*.json ./
+COPY package*.json ./
 RUN npm install
-COPY frontend ./
+COPY . ./
 RUN npm run build
 
 # Etap 2: Nginx serwujący Vue + proxy do backendu
 FROM nginx:alpine
-COPY --from=build /app/dist /usr/share/nginx/html
+COPY --from=build /app/dist /usr/share/nginx/html/odoo
 
 # Konfiguracja Nginx z proxy
 COPY nginx.conf /etc/nginx/conf.d/default.conf

frontend/nginx.conf

@@ -1,32 +1,13 @@
 server {
     listen 80;
+    root /usr/share/nginx/html;
+    index index.html;
 
     # Przekierowanie bez / na /odoo/
     location = /odoo {
         return 301 /odoo/;
     }
 
-    # Serwowanie Vue
-    location /odoo/ {
-        alias /usr/share/nginx/html/;
-        index index.html;
-        try_files $uri $uri/ /odoo/index.html;
-    }
-
-    # no cache index.html
-    location = /odoo/index.html {
-        add_header Cache-Control "no-cache, no-store, must-revalidate";
-        expires 0;
-    }
-
-    # cache JS/CSS/OBRAZY na długo
-    location ~* \.(?:js|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
-        add_header Cache-Control "public, max-age=31536000, immutable";
-        access_log off;
-        expires 1y;
-        alias /usr/share/nginx/html/;
-    }
-
     # Proxy do backendu
     location /odoo/api/ {
         proxy_pass http://backend:8000/;
@@ -35,5 +16,23 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
     }
+
+    # Serwowanie Vue
+    location /odoo/ {
+        try_files $uri $uri/ /odoo/index.html;
+    }
+
+    # Ustawienia cache dla assetów
+    location ~* /odoo/.*\.(?:js|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
+        add_header Cache-Control "public, max-age=31536000, immutable";
+        access_log off;
+        expires 1y;
+    }
+
+    # Brak cache'owania dla pliku index.html
+    location = /odoo/index.html {
+        add_header Cache-Control "no-cache, no-store, must-revalidate";
+        expires 0;
+    }
 }