From 3bf3b486bff140dd785b3a5df737de8bfdbda9de Mon Sep 17 00:00:00 2001
From: Jarkko Toivanen <jt@jakest.us>
Date: Thu, 12 Dec 2024 00:13:47 +0200
Subject: [PATCH] Fixing latest restructuring and container oopsies

---
 .gitignore                    |  1 +
 Makefile                      | 12 +++++++-----
 {data => src/data}/.gitignore |  0
 {data => src/data}/.htaccess  |  0
 4 files changed, 8 insertions(+), 5 deletions(-)
 rename {data => src/data}/.gitignore (100%)
 rename {data => src/data}/.htaccess (100%)

diff --git a/.gitignore b/.gitignore
index e69de29..adbb97d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+data/
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 14af4da..b57960b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
 current_dir := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))
 
-data/:
-	mkdir data
-	chmod 777 data
-podman-run:
+data/: FORCE
+podman-run: data/
 	podman build -t snuffler/snuffler-web .
 	podman run -v ./data/:/var/www/html/data/ -p 8080:80 localhost/snuffler/snuffler-web:dev
 
-docker-run:
+docker-run: data/
 	docker build -t snuffler/snuffler-web:dev .
 	docker run -v $(current_dir)data/:/var/www/html/data/ -p 8080:80 snuffler/snuffler-web:dev
+
+FORCE:
+	cp -r src/data ./
+	chmod 777 data
diff --git a/data/.gitignore b/src/data/.gitignore
similarity index 100%
rename from data/.gitignore
rename to src/data/.gitignore
diff --git a/data/.htaccess b/src/data/.htaccess
similarity index 100%
rename from data/.htaccess
rename to src/data/.htaccess