From 721188ef62e513c282520171d4e4da127eb3c492 Mon Sep 17 00:00:00 2001
From: Dylan Baird <dylan@dylanbaird.com>
Date: Mon, 23 Dec 2024 15:28:19 -0500
Subject: [PATCH] Website does not have container - weird idea. Build script
 for copying static assets to Caddy.

---
 caddy/Caddyfile           | 2 +-
 caddy/Dockerfile          | 6 +++++-
 caddy/build.sh            | 8 ++++++++
 docker-compose.yml        | 7 -------
 dylanbaird.com/Dockerfile | 5 -----
 5 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100755 caddy/build.sh
 delete mode 100644 dylanbaird.com/Dockerfile

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index cb66907..4bfe2e8 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -15,6 +15,6 @@ registry.dylanbaird.com {
 }
 
 dylanbaird.com {
-    root  /srv/dylanbaird
+    root * /srv/dylanbaird
     file_server
 }
\ No newline at end of file
diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index 79f0e35..9efa9cb 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -1,3 +1,7 @@
 FROM caddy:latest
 
-COPY Caddyfile /etc/caddy/Caddyfile
\ No newline at end of file
+COPY Caddyfile /etc/caddy/Caddyfile
+
+COPY ./dylanbaird.com/src/ /srv/dylanbaird
+
+RUN caddy fmt --overwrite /etc/caddy/Caddyfile
\ No newline at end of file
diff --git a/caddy/build.sh b/caddy/build.sh
new file mode 100755
index 0000000..aaf3d7e
--- /dev/null
+++ b/caddy/build.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+cp -r ../dylanbaird.com .
+sudo docker build -t boulangermontrealais/barrios:caddy .
+sudo docker push boulangermontrealais/barrios:caddy
+rm -rf dylanbaird.com
+
+echo "Build and push completed successfully."
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index dd99861..8de2ddc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,11 +36,4 @@ services:
         volumes:
             - /tarrega/caddy/config:/config
             - /tarrega/caddy/data:/data
-            - /tarrega/dylanbaird:/srv/dylanbaird
-        depends_on:
-            - dylanbaird
-    dylanbaird:
-        image: boulangermontrealais/barrios:dylanbaird
-        container_name: dylanbaird
-        volumes:
             - /tarrega/dylanbaird:/srv/dylanbaird
\ No newline at end of file
diff --git a/dylanbaird.com/Dockerfile b/dylanbaird.com/Dockerfile
deleted file mode 100644
index 5743e3f..0000000
--- a/dylanbaird.com/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM alpine:latest
-
-WORKDIR /srv/dylanbaird
-
-COPY ./src .
\ No newline at end of file