From 96fab302b5b7796c06aacd701e154a27ecbb2dab Mon Sep 17 00:00:00 2001
From: Cian Hughes <chughes000@gmail.com>
Date: Mon, 13 Jan 2025 23:39:31 +0000
Subject: [PATCH] Implementation of server and reverse proxy

---
 Dockerfile          |  9 +++++----
 conf/Caddyfile      |  2 +-
 docker-compose.yaml | 38 ++++++++++++++++++++++++++++++++++++++
 vite.config.js      |  4 ++++
 4 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 docker-compose.yaml

diff --git a/Dockerfile b/Dockerfile
index d334fcc..d107293 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
 FROM almalinux:latest
 
-ENV SOCKET_PATH=false
-ENV HOST="0.0.0.0"
-ENV PORT=3000
+ENV NODE_ENV="production"
 
 RUN dnf upgrade --assumeyes
 RUN dnf install --assumeyes unzip git
@@ -16,7 +14,10 @@ WORKDIR /src
 RUN git clone https://github.com/Cian-H/am-d-model.eu.git
 WORKDIR /src/am-d-model.eu
 RUN bun install
+RUN bun pm trust --all
+RUN ls
+RUN bunx vite build
 RUN mkdir -p /var/www/site/
-RUN bunx vite build --outDir /var/www/site/
+RUN mv ./build/* /var/www/site/
 
 ENTRYPOINT ["bun", "/var/www/site/index.js"]
diff --git a/conf/Caddyfile b/conf/Caddyfile
index 85275c8..faf68c3 100644
--- a/conf/Caddyfile
+++ b/conf/Caddyfile
@@ -1,3 +1,3 @@
 http://127.0.0.1 {
-    reverse-proxy am-d-model-site:8080
+    reverse_proxy am-d-modeleu_site_1:8080
 }
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000..080b063
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,38 @@
+version: "3.8"
+
+networks:
+  am-d-model-network:
+    name: am-d-model-network
+
+services:
+  site:
+    build: .
+    networks:
+      - host
+      - am-d-model-network
+    restart: unless-stopped
+
+  caddy:
+    image: caddy:latest
+    networks:
+      - am-d-model-network
+    ports:
+      - "3000:80"
+    volumes:
+      - caddy_data:/data
+      - caddy_config:/config
+    command: >
+      sh -c "wget -O /etc/caddy/Caddyfile https://raw.githubusercontent.com/Cian-H/am-d-model.eu/refs/heads/main/conf/Caddyfile &&
+      caddy run --config /etc/caddy/Caddyfile"
+    restart: unless-stopped
+
+  # watchtower:
+  #   image: containrrr/watchtower
+  #   volumes:
+  #     - /var/run/docker.sock:/var/run/docker.sock
+  #   command: --interval 30 --cleanup
+  #   restart: unless-stopped
+
+volumes:
+  caddy_data:
+  caddy_config:
diff --git a/vite.config.js b/vite.config.js
index 0513431..b55c11b 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -32,4 +32,8 @@ export default defineConfig({
         cssMinify: true,
         cssCodeSplit: true
     },
+    server: {
+        host: "0.0.0.0",
+        port: 3000,
+    },
 });