From 17c7a359b18936256592807e5dfbfe845afc37cd Mon Sep 17 00:00:00 2001
From: MyServer <my@server.com>
Date: Fri, 2 May 2025 18:50:03 +0500
Subject: [PATCH 1/3] Added new file

---
 .docker-compose.yml.swp | Bin 0 -> 1024 bytes
 Dockerfile              |  16 ++++++++++++++++
 docker-compose.yml      |  20 ++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 .docker-compose.yml.swp
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml

diff --git a/.docker-compose.yml.swp b/.docker-compose.yml.swp
new file mode 100644
index 0000000000000000000000000000000000000000..c3aa9f976b66be857ce3426ace2a81ec2af861bd
GIT binary patch
literal 1024
zcmYc?$V<%2S1{KzVn6}wZ}Bq}<>!~62;$%rrxul^7U7UY5>Cla&Q2}TP0r6P$S+RS
XtIW+ok{o4@hQMeD&^iP{(JcS~zqSxr

literal 0
HcmV?d00001

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..5b91041
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,16 @@
+# Dockerfile
+
+FROM node:20-alpine
+
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm ci
+
+COPY . .
+
+RUN npm run build
+
+EXPOSE 39890
+
+CMD ["npm", "run", "preview", "--", "--port", "39890"]
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..cdf969d
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,20 @@
+version: '3.8'
+
+services:
+  kb-personal:
+    build: .
+    container_name: kb-personal
+    networks:
+      - proxy-net
+    expose:
+      -  39890
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.kb-personal.rule=Host(`wiki.sinenikolsky.ru`)"
+      - "traefik.http.routers.kb-personal.entrypoints=http"
+      - "traefik.http.services.kb-personal.loadbalancer.server.port=39890"
+    restart: unless-stopped
+
+networks:
+  proxy-net:
+    external: true

From 2377e07cf6af3c4f5c9f0fb0a84924f545da873a Mon Sep 17 00:00:00 2001
From: MyServer <my@server.com>
Date: Fri, 2 May 2025 19:55:32 +0500
Subject: [PATCH 2/3] Deploy

---
 .docker-compose.yml.swp | Bin 1024 -> 0 bytes
 Dockerfile              |  22 ++++++++++++++++------
 docker-compose.yml      |   9 +++++----
 3 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 .docker-compose.yml.swp

diff --git a/.docker-compose.yml.swp b/.docker-compose.yml.swp
deleted file mode 100644
index c3aa9f976b66be857ce3426ace2a81ec2af861bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmYc?$V<%2S1{KzVn6}wZ}Bq}<>!~62;$%rrxul^7U7UY5>Cla&Q2}TP0r6P$S+RS
XtIW+ok{o4@hQMeD&^iP{(JcS~zqSxr

diff --git a/Dockerfile b/Dockerfile
index 5b91041..6fe0e50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
-# Dockerfile
-
-FROM node:20-alpine
+# Этап сборки
+FROM node:20-alpine AS builder
 
 WORKDIR /app
 
@@ -8,9 +7,20 @@ COPY package*.json ./
 RUN npm ci
 
 COPY . .
-
 RUN npm run build
 
-EXPOSE 39890
+# Этап продакшна — отдача статики
+FROM nginx:alpine AS production
 
-CMD ["npm", "run", "preview", "--", "--port", "39890"]
+# Удаляем дефолтную страницу Nginx
+RUN rm -rf /usr/share/nginx/html/*
+
+# Копируем Astro-сборку
+COPY --from=builder /app/dist /usr/share/nginx/html
+
+# Опционально: свой nginx.conf
+# COPY nginx.conf /etc/nginx/nginx.conf
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/docker-compose.yml b/docker-compose.yml
index cdf969d..788f7e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,13 +6,14 @@ services:
     container_name: kb-personal
     networks:
       - proxy-net
-    expose:
-      -  39890
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.kb-personal.rule=Host(`wiki.sinenikolsky.ru`)"
-      - "traefik.http.routers.kb-personal.entrypoints=http"
-      - "traefik.http.services.kb-personal.loadbalancer.server.port=39890"
+      - "traefik.http.routers.kb-personal.entrypoints=http,https"
+      - "traefik.http.routers.kb-personal.tls=true"
+      - "traefik.http.services.kb-personal.loadbalancer.server.port=80"
+    expose:
+      - 80
     restart: unless-stopped
 
 networks:

From 11d33147c4eb7a3549d4f1aba33230d6f9d70a57 Mon Sep 17 00:00:00 2001
From: MyServer <my@server.com>
Date: Fri, 2 May 2025 20:48:57 +0500
Subject: [PATCH 3/3] removed

---
 Dockerfile         | 26 --------------------------
 docker-compose.yml | 21 ---------------------
 2 files changed, 47 deletions(-)
 delete mode 100644 Dockerfile
 delete mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 6fe0e50..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Этап сборки
-FROM node:20-alpine AS builder
-
-WORKDIR /app
-
-COPY package*.json ./
-RUN npm ci
-
-COPY . .
-RUN npm run build
-
-# Этап продакшна — отдача статики
-FROM nginx:alpine AS production
-
-# Удаляем дефолтную страницу Nginx
-RUN rm -rf /usr/share/nginx/html/*
-
-# Копируем Astro-сборку
-COPY --from=builder /app/dist /usr/share/nginx/html
-
-# Опционально: свой nginx.conf
-# COPY nginx.conf /etc/nginx/nginx.conf
-
-EXPOSE 80
-
-CMD ["nginx", "-g", "daemon off;"]
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 788f7e9..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: '3.8'
-
-services:
-  kb-personal:
-    build: .
-    container_name: kb-personal
-    networks:
-      - proxy-net
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.kb-personal.rule=Host(`wiki.sinenikolsky.ru`)"
-      - "traefik.http.routers.kb-personal.entrypoints=http,https"
-      - "traefik.http.routers.kb-personal.tls=true"
-      - "traefik.http.services.kb-personal.loadbalancer.server.port=80"
-    expose:
-      - 80
-    restart: unless-stopped
-
-networks:
-  proxy-net:
-    external: true