From bb710e1769629b7507e8536e5645649eec45077f Mon Sep 17 00:00:00 2001
From: afterlifepro <vielle.dev@proton.me>
Date: Sat, 20 Dec 2025 21:20:25 +0000
Subject: [PATCH] switch off of git modules lol

---
 .gitmodules      | 12 ------------
 caddy/Dockerfile | 28 +++++++++++++++-------------
 commit.sh        | 10 ++--------
 compose.yaml     |  2 +-
 dnd              |  1 -
 dong-web         |  1 -
 prs              |  1 -
 saltire-the-gays |  1 -
 8 files changed, 18 insertions(+), 38 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 dnd
 delete mode 160000 dong-web
 delete mode 160000 prs
 delete mode 160000 saltire-the-gays

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 00e873c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,12 +0,0 @@
-[submodule "prs"]
-	path = prs
-	url = https://tangled.sh/@vielle.dev/site
-[submodule "dong-web"]
-	path = dong-web
-	url = https://tangled.sh/@vielle.dev/dong-web
-[submodule "saltire-the-gays"]
-	path = saltire-the-gays
-	url = https://tangled.sh/@vielle.dev/saltire-the-gays
-[submodule "dnd"]
-	path = dnd
-	url = https://tangled.sh/@vielle.dev/dnd-astral-powers
diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index e10b871..c2710ff 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -1,32 +1,34 @@
 #########
 # BUILD #
 #########
-FROM node:24-alpine AS build-templ
+FROM node:24-alpine AS build
 WORKDIR /app
 
+RUN apk add git
+
 # install pnpm
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable pnpm && corepack install -g pnpm@latest
 
 # dong web
-FROM build-templ AS build-dong-web
+FROM build AS build-dong
 WORKDIR /app
-COPY ./dong-web /app/dong-web
-RUN pnpm --dir /app/dong-web install --prod
-RUN pnpm --dir /app/dong-web run build --outDir /app/dong-web/dist
+RUN git clone https://tangled.org/vielle.dev/dong-web.git /app/dong
+RUN pnpm --dir /app/dong install --prod
+RUN pnpm --dir /app/dong run build --outDir /app/dong/dist
 
 # saltire
-FROM build-templ AS build-saltire-the-gays
+FROM build AS build-saltire
 WORKDIR /app
-COPY ./saltire-the-gays /app/saltire-the-gays
-RUN pnpm --dir /app/saltire-the-gays install --prod
-RUN pnpm --dir /app/saltire-the-gays run build --outDir /app/saltire-the-gays/dist
+RUN git clone https://tangled.org/vielle.dev/saltire-the-gays.git /app/saltire
+RUN pnpm --dir /app/saltire install --prod
+RUN pnpm --dir /app/saltire run build --outDir /app/saltire/dist
 
 # astral powers
-FROM build-templ AS build-dnd
+FROM build AS build-dnd
 WORKDIR /app
-COPY ./dnd /app/dnd
+RUN git clone https://tangled.org/vielle.dev/dnd-astral-powers.git /app/dnd
 RUN pnpm --dir /app/dnd install --prod
 RUN pnpm --dir /app/dnd run build --outDir /app/dnd/dist
 
@@ -36,8 +38,8 @@ RUN pnpm --dir /app/dnd run build --outDir /app/dnd/dist
 FROM caddy:2.10.2
 
 # copy built files to /srv
-COPY --from=build-dong-web /app/dong-web/dist /srv/dong-web
-COPY --from=build-saltire-the-gays /app/saltire-the-gays/dist /srv/saltire-the-gays
+COPY --from=build-dong /app/dong/dist /srv/dong
+COPY --from=build-saltire /app/saltire/dist /srv/saltire
 COPY --from=build-dnd /app/dnd/dist /srv/dnd
 
 CMD caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
\ No newline at end of file
diff --git a/commit.sh b/commit.sh
index d165fef..9e73509 100755
--- a/commit.sh
+++ b/commit.sh
@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 
-echo
-echo 
-echo "Got new commit: $(date)"
-echo "---"
-echo
+echo "\n\nGot new commit: $(date)\n---\n\n"
 
 # pull latest version
 git fetch --all
@@ -27,11 +23,9 @@ BODY
 # restart/rebuild all containers
 docker compose build --no-cache
 docker compose up -d --force-recreate
-# add second docker compose up because it acts up ??
-docker compose up -d
 
 # clear out dockerfiles to stop my drive exploding
-docker system prune -af
+docker system prune -af > /dev/null
 
 cat <<- BODY | curl -d @- http://compuper:6500/notify
 name=vps%3A%20ready%20($(git log -1 --pretty=format:%h))\
diff --git a/compose.yaml b/compose.yaml
index 4a65c28..ee3522e 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,6 +1,6 @@
 services:
   prs:
-    build: ./prs
+    build: https://tangled.sh/@vielle.dev/site.git
     restart: unless-stopped
     env_file: ./prs.env
     volumes:
diff --git a/dnd b/dnd
deleted file mode 160000
index 7f57873..0000000
--- a/dnd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7f578739224841fe82c2328c8b4124ab80039099
diff --git a/dong-web b/dong-web
deleted file mode 160000
index adc63bb..0000000
--- a/dong-web
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit adc63bb7e9ed1f9fe33add1dada07176c1be5c9f
diff --git a/prs b/prs
deleted file mode 160000
index 36db7e7..0000000
--- a/prs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 36db7e74a40eba5a0ca4e0581f083eac731b86b4
diff --git a/saltire-the-gays b/saltire-the-gays
deleted file mode 160000
index 726938a..0000000
--- a/saltire-the-gays
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 726938a73505fa06d9448c9caee3eb555b63e208
-- 
2.51.2