diff --git a/docker-compose.yml b/docker-compose.yml index 6e4644a..721baf8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,9 +7,8 @@ services: dockerfile: docker/frontend/Dockerfile container_name: support-frontend restart: unless-stopped - volumes: - - ./frontend:/app - - /app/node_modules + ports: + - "80:80" depends_on: - backend @@ -26,20 +25,5 @@ services: - ./backend:/app - sqlite_data:/app/instance - nginx: - image: nginx:alpine - container_name: support-nginx - restart: unless-stopped - ports: - - "80:80" - volumes: - - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro - - frontend_build:/usr/share/nginx/html - depends_on: - - frontend - - backend - volumes: - sqlite_data: - frontend_build: \ No newline at end of file + sqlite_data: \ No newline at end of file diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 0eb83e2..cb7409a 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -17,10 +17,11 @@ FROM nginx:alpine # Copy built files COPY --from=build /app/dist /usr/share/nginx/html -# Copy nginx config +# Copy nginx configurations +COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf -# Create directories and set permissions +# Create required directories and set permissions RUN mkdir -p /var/cache/nginx \ /var/cache/nginx/client_temp \ /var/cache/nginx/proxy_temp \ @@ -36,7 +37,4 @@ RUN mkdir -p /var/cache/nginx \ /var/cache/nginx/scgi_temp \ /var/run -# Remove user directive -RUN sed -i '/user/d' /etc/nginx/nginx.conf - CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file