diff --git a/main_dc/docker-compose.yml b/main_dc/docker-compose.yml index 309399b..f9c3117 100644 --- a/main_dc/docker-compose.yml +++ b/main_dc/docker-compose.yml @@ -158,7 +158,7 @@ services: easysite: build: - context: ./yalarba/easySite/easySite # путь к вашему Nuxt проекту + context: ./yalarba/easySite/easySite dockerfile: Dockerfile container_name: easysite restart: unless-stopped @@ -172,7 +172,7 @@ services: - web-network - app-network healthcheck: - test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:3000/" ] + test: ["CMD", "curl", "-f", "http://localhost:3000/"] interval: 30s timeout: 10s retries: 3 diff --git a/main_dc/yalarba/easySite/easySite/.data/content/contents.sqlite b/main_dc/yalarba/easySite/easySite/.data/content/contents.sqlite new file mode 100644 index 0000000..33ae8c7 Binary files /dev/null and b/main_dc/yalarba/easySite/easySite/.data/content/contents.sqlite differ diff --git a/main_dc/yalarba/easySite/easySite/.gitignore b/main_dc/yalarba/easySite/easySite/.gitignore index 4a7f73a..17aa31e 100644 --- a/main_dc/yalarba/easySite/easySite/.gitignore +++ b/main_dc/yalarba/easySite/easySite/.gitignore @@ -1,24 +1,10 @@ -# Nuxt dev/build outputs -.output -.data -.nuxt -.nitro -.cache -dist - -# Node dependencies +# .dockerignore node_modules - -# Logs -logs +.nuxt +.output +.git *.log - -# Misc -.DS_Store -.fleet -.idea - -# Local env files .env -.env.* -!.env.example +.DS_Store +Dockerfile +.dockerignore \ No newline at end of file diff --git a/main_dc/yalarba/easySite/easySite/Dockerfile b/main_dc/yalarba/easySite/easySite/Dockerfile index af0f0d8..3875233 100644 --- a/main_dc/yalarba/easySite/easySite/Dockerfile +++ b/main_dc/yalarba/easySite/easySite/Dockerfile @@ -1,24 +1,27 @@ -# Dockerfile -FROM node:18-alpine +# Multi-stage build +FROM node:20-alpine AS builder WORKDIR /app - -# Копируем package files COPY package*.json ./ -COPY nuxt.config.ts ./ -COPY tsconfig.json ./ - -# Устанавливаем зависимости RUN npm ci - -# Копируем исходный код COPY . . - -# Собираем приложение RUN npm run build -# Экспортируем порт +FROM node:20-alpine AS production + +RUN apk add --no-cache curl +WORKDIR /app + +COPY --from=builder /app/package*.json ./ +RUN npm ci --only=production + +COPY --from=builder /app/.output ./.output + +RUN addgroup -g 1001 -S nodejs +RUN adduser -S nuxtjs -u 1001 +RUN chown -R nuxtjs:nodejs /app +USER nuxtjs + EXPOSE 3000 -# Запускаем приложение -CMD ["npm", "run", "start"] \ No newline at end of file +CMD ["node", ".output/server/index.mjs"] \ No newline at end of file