diff --git a/docker-compose.yml b/docker-compose.yml index 8819ae4..2e67263 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,9 +3,10 @@ services: build: context: . dockerfile: docker/frontend/Dockerfile - container_name: frontend - networks: - - app-network + container_name: support-frontend + restart: unless-stopped + depends_on: + - backend backend: build: @@ -22,17 +23,16 @@ services: - app-network nginx: - build: - context: . - dockerfile: docker/nginx/Dockerfile - container_name: nginx - ports: - - "80:80" - depends_on: - - frontend - - backend - networks: - - app-network + build: + context: . + dockerfile: docker/nginx/Dockerfile + container_name: support-nginx + restart: unless-stopped + ports: + - "80:80" + depends_on: + - frontend + - backend networks: app-network: diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index b6468ec..8f11d47 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -3,26 +3,29 @@ FROM node:18-alpine as build WORKDIR /app -# Copy package files +# Копируем package.json и package-lock.json COPY frontend/package*.json ./ -# Install dependencies -RUN npm ci +# Устанавливаем зависимости +RUN npm install -# Copy source code +# Копируем исходный код COPY frontend/ ./ -# Build the app +# Собираем приложение RUN npm run build # Production stage FROM nginx:alpine -# Copy built files -COPY --from=build /app/dist /usr/share/nginx/html +# Копируем собранные файлы +COPY --from=build /app/dist /usr/share/nginx/html/ -# Add nginx config -COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf +# Удаляем дефолтную страницу nginx +RUN rm -rf /usr/share/nginx/html/50x.html + +# Копируем конфигурацию nginx +COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/ EXPOSE 80