From e7c5123f1481a0605367aef95d7ea54e47f14503 Mon Sep 17 00:00:00 2001
From: valitovgaziz <valitovgaziz@yandex.ru>
Date: Tue, 28 Oct 2025 06:25:37 +0500
Subject: [PATCH] 	modified:   main_dc/docker-compose.yml 	new file:  
 main_dc/yalarba/easySite/easySite/.data/content/contents.sqlite 
 modified:   main_dc/yalarba/easySite/easySite/.gitignore 	modified:  
 main_dc/yalarba/easySite/easySite/Dockerfile change into Dockerfile for
 easySite node verstion from 18 to 20

---
 main_dc/docker-compose.yml                    |   4 +--
 .../easySite/.data/content/contents.sqlite    | Bin 0 -> 40960 bytes
 main_dc/yalarba/easySite/easySite/.gitignore  |  28 ++++-----------
 main_dc/yalarba/easySite/easySite/Dockerfile  |  33 ++++++++++--------
 4 files changed, 27 insertions(+), 38 deletions(-)
 create mode 100644 main_dc/yalarba/easySite/easySite/.data/content/contents.sqlite

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 0000000000000000000000000000000000000000..33ae8c72c262acadf658bc3e7f4c30cdda4628af
GIT binary patch
literal 40960
zcmeI)&u`jR0Kjp(BoNvXDs2+#p_`Q*=%kUAq^ZiOb%?W&q)B5OQgWzei~%?N3K$YH
z?T~7xN&6r67wocsV%Po`JM`Aej<cb(1VTF`q^9cE!tmbndyn@%&qA`FdFj1v+p(lV
ztx+)?X<4`>h@$XVk_17x>F(Fvy}t$Az)U~leu@L(alxCy;%{Gv!v6}v8*ha9zr%lp
ztD!&Uf1g)xyb0-{Z^jiP9RUOoKmY**5I_I{1g0eL@@^myiN(ZUeU6bUTe?}RI#$&g
z_Zdv8imWM;Ca-QQ(r_;6uAP@O<(VcuRZ~x7H7ji?*&n0@$9Brrf|QZf<c6%e3AtLn
zv(U}yM)FqEY}j?ju2l!~Sf_47nnQ^d%Q4;+tQu{*X!Oc;zjaMnm-n|d$!WAKx8l0t
zlm=^TTD4wTsh=_W^Dj|1W7DxJgBf+bWHd{<{x<jiPHJyo`TkMRA4$hV!LH`5)8=v6
zy;RbTmQ(A-^<fKrX*ebDXl|kk;=>hOKmTzi5Q#>`mv=4>mR&8>-evY8vzHH(cWB%g
zH7vs$lhxhbZAIScqBL5j(`r~5t1&zb?a`#m%@Tfp<Vp0SX59|F2lJwHiP`^O^gWeV
z)PMe+7>LB<;`wpUDQ~r{a;;wJp4f(2vh<OZYZt{vj*nw=D>ILptqZ45+bFj#obH#~
zBz^wKL42&uNE6&MY9wtYd2PZ<;-i)L+~1Np@Ao9+?qc{)!F{nIfB*srAb<b@2q1s}
z0tg_0z?BeqD$cIlzHRFIn(W?=lhcZxQPgy5cSqOT%Zn?E_j>PY?5tJH9>@07<e8RP
z+bNzcrT06<hH|)9SWg-8&BLwwYNfr@(T=<celh%y;J(-pKmY**5I_I{1Q0*~0R#|0
z;4>G9_*R0K-8Sf5|GyH#uRik*(tHFEKmY**5I_I{1Q0*~0R+AzfkmGgoM8UH_x%5J
zA^iMHLZYt-Ab<b@2q1s}0tg_000Ib1Q{ent(H{$%O|!pdK!3@GTrrg`)nBNs%)_(X
z#-^et3s(7LtG=mg`3Kq7Pn#$9scjuSELT#!NBU#235sNw4-z?NLpv}E>smZ}KY!Rx
zB~M-??j^GK_c{g3K6y}mww{waM`myS|FsZ)J<Wbo7Xk<%fB*srAb<b@2q1s}0tkF6
zfv<e-y@<Dq7xr&NbQk!))oqa%?C(K0++82=Q?-@vMF0T=5I_I{1Q0*~0R#|00D%t(
zc+dY&Jpa%C|34tgAp{UW009ILKmY**5I_I{1g@UIgxCMx|Nn*F{QuSK3oSwb0R#|0
u009ILKmY**5I_KdsR#@_|38)bs00B75I_I{1Q0*~0R#|0009K9p1^+zQ2e?8

literal 0
HcmV?d00001

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