From 6bb0669e45b69c8408dd4ad34c6fe64312aec15a Mon Sep 17 00:00:00 2001 From: Marius Robert Macamete Date: Sun, 31 Aug 2025 18:52:46 +0300 Subject: [PATCH] modify run filder --- transportmanager/Dockerfile | 22 ++++++++-------------- transportmanager/docker-compose.yml | 4 ++-- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/transportmanager/Dockerfile b/transportmanager/Dockerfile index 3c64e14..0f818f5 100644 --- a/transportmanager/Dockerfile +++ b/transportmanager/Dockerfile @@ -1,6 +1,5 @@ FROM python:3.12-slim -# System deps: nginx & supervisor RUN apt-get update && apt-get install -y --no-install-recommends \ nginx supervisor && \ rm -rf /var/lib/apt/lists/* @@ -8,30 +7,25 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ WORKDIR /app # Python deps -COPY transportmanager/requirements.txt /app/requirements.txt +COPY requirements.txt /app/requirements.txt RUN pip install --no-cache-dir -r /app/requirements.txt # App code -COPY transportmanager/server /app/server -COPY transportmanager/client /app/client +COPY server /app/server +COPY client /app/client -# Nginx config -COPY transportmanager/deploy/nginx.conf /etc/nginx/nginx.conf +# Nginx & Supervisor configs +COPY deploy/nginx.conf /etc/nginx/nginx.conf +COPY deploy/supervisord.conf /etc/supervisor/conf.d/supervisord.conf -# Supervisor config -COPY transportmanager/deploy/supervisord.conf /etc/supervisor/conf.d/supervisord.conf +RUN mkdir -p /var/run/nginx /app/server/instance -# Nginx needs a pid file path -RUN mkdir -p /var/run/nginx - -# Environment defaults ENV TZ=Europe/Bucharest \ API_BIND=127.0.0.1:5000 \ FLET_BIND=127.0.0.1:8080 \ API_BASE_PATH=/api -# Expose only 80 internally (for nginx) EXPOSE 80 -# Run all processes via supervisor +# (You said we can omit the healthcheck for now) CMD ["/usr/bin/supervisord","-c","/etc/supervisor/conf.d/supervisord.conf"] \ No newline at end of file diff --git a/transportmanager/docker-compose.yml b/transportmanager/docker-compose.yml index 2b95204..0f3dec4 100644 --- a/transportmanager/docker-compose.yml +++ b/transportmanager/docker-compose.yml @@ -3,8 +3,8 @@ version: "3.8" services: tms: build: - context: . # repo root (where transportmanager/ lives) - dockerfile: transportmanager/Dockerfile + context: . # context is the transportmanager/ folder + dockerfile: ./Dockerfile # Dockerfile is inside transportmanager/ image: tms:latest container_name: tms restart: always