From 4e90652410445402c01b6d48ef0589704c2ea199 Mon Sep 17 00:00:00 2001
From: Kegan Myers <kegan@keganmyers.com>
Date: Sun, 23 Jul 2023 03:17:35 -0500
Subject: [PATCH] move src directory to akkoma

---
 .dockerignore | 2 +-
 .gitmodules   | 3 +++
 Dockerfile    | 2 +-
 src => akkoma | 0
 build.sh      | 4 ++--
 5 files changed, 7 insertions(+), 4 deletions(-)
 rename src => akkoma (100%)

diff --git a/.dockerignore b/.dockerignore
index d21dd13..68e59cd 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,3 @@
 *
-!src
+!akkoma
 !prod.exs
diff --git a/.gitmodules b/.gitmodules
index dfe4a0a..3a72197 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src"]
 	path = src
 	url = https://akkoma.dev/AkkomaGang/akkoma.git
+[submodule "akkoma"]
+	path = akkoma
+	url = https://akkoma.dev/AkkomaGang/akkoma.git
diff --git a/Dockerfile b/Dockerfile
index 3093103..5e06907 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM registry.nrd.li/nrdli/akkoma-base:${AKKOMA_COMMIT}
 
 ENV PROD_SECRET_FILE=/config/prod.secret.exs
 
-ADD src /opt/akkoma/
+ADD akkoma /opt/akkoma/
 ADD prod.exs /opt/akkoma/config/prod.exs
 
 USER root
diff --git a/src b/akkoma
similarity index 100%
rename from src
rename to akkoma
diff --git a/build.sh b/build.sh
index 29c4c10..9a8677e 100755
--- a/build.sh
+++ b/build.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 set -Eeuxo pipefail
 
-AKKOMA_COMMIT=$(cd src; git rev-parse HEAD)
+AKKOMA_COMMIT=$(cd akkoma; git rev-parse HEAD)
 LOCAL_COMMIT=$(git rev-parse HEAD)
 AKKOMA_BASE_IMAGE="registry.nrd.li/nrdli/akkoma-base:${AKKOMA_COMMIT}"
 AKKOMA_FINAL_IMAGE="registry.nrd.li/nrdli/akkoma:${LOCAL_COMMIT}"
 
-pushd src
+pushd akkoma
 docker build \
   -t "${AKKOMA_BASE_IMAGE}" \
   .