From 2aec7a11703ff86d9fd11c55faa39d1a94616401 Mon Sep 17 00:00:00 2001
From: Marc Cataford <mcat@riseup.net>
Date: Fri, 10 May 2024 00:06:01 -0400
Subject: [PATCH] chore: remove constants file

---
 README.md    | 42 ++----------------------------------------
 build.sh     |  6 ++----
 constants.sh |  7 -------
 start.sh     | 10 ++++------
 4 files changed, 8 insertions(+), 57 deletions(-)
 delete mode 100644 constants.sh

diff --git a/README.md b/README.md
index 2448c5a..690b12a 100644
--- a/README.md
+++ b/README.md
@@ -1,43 +1,5 @@
 # Bookstack
 
-Sets up and manages a [Bookstack](https://www.bookstackapp.com/) instance.
+## Configuration
 
-## Getting started
-
-- `start.sh` starts the database and application.
-- `stop.sh` stops the database and application.
-- `build.sh` builds images for the database and application and should be run _before_ starting anything.
-
-Any commitable constant can be defined in `constants.sh` and will be injected in all of the scripts above.
-
-__The `task` commands should be used to interact with the service.__
-
-## Volumes
-
-This expects two volumes to exist at `$APP_DATA_DIR`: `bookstack-app` and `bookstack-db`.
-
-## Note on dotenv files
-
-dotenv files are expected to exist at `$ENV_FILE_DIR` under `bookstack-db.env` and `bookstack-app.env`.
-
-See reference:
-
-```
-# bookstack-db-env
-
-MARIADB_USER=...
-MARIADB_PASSWORD=...
-MARIADB_ROOT_PASSWORD=...
-MARIADB_DATABASE=...
-```
-
-```
-# bookstack-app.env
-
-DB_PORT=...
-DB_USER=...
-DB_PASS=...
-DB_DATABASE=...
-DB_HOST=...
-APP_URL=...
-```
+The application does not expect any environment files, an empty one should be supplied.
diff --git a/build.sh b/build.sh
index cdce680..e556a30 100644
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
 
-source constants.sh
-
-podman build -t $DB_IMAGE_NAME:$IMAGE_VERSION -f Dockerfile-bookstack-db .
-podman build -t $APP_IMAGE_NAME:$IMAGE_VERSION -f Dockerfile-bookstack-app .
+podman build -t "spad-bookstack-db:$IMAGE_VERSION" -f Dockerfile-bookstack-db .
+podman build -t "spad-bookstack-app:$IMAGE_VERSION" -f Dockerfile-bookstack-app .
diff --git a/constants.sh b/constants.sh
deleted file mode 100644
index 01376f9..0000000
--- a/constants.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export APP_NAME="bookstack"
-export APP_CONTAINER_NAME=$APP_NAME-app
-export APP_IMAGE_NAME=$CONTAINER_NAME_PREFIX-$APP_CONTAINER_NAME
-export DB_CONTAINER_NAME=$APP_NAME-db
-export DB_IMAGE_NAME=$CONTAINER_NAME_PREFIX-$DB_CONTAINER_NAME
diff --git a/start.sh b/start.sh
index a70a7d2..f0de274 100755
--- a/start.sh
+++ b/start.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source constants.sh
-
 podman pod create \
     -p 3010:80 \
     --replace \
@@ -10,16 +8,16 @@ podman pod create \
 podman run \
     -d \
     --pod "bookstack" \
-    --name "$DB_CONTAINER_NAME" \
+    --name "bookstack_db" \
     --env-file "$ENV_FILE_DIR"/bookstack-db.env \
     --mount type=bind,source="$APP_DATA_DIR"/bookstack-db,target=/var/lib/mysql \
-    mariadb:10.6 \
+    "spad-bookstack-db:$IMAGE_VERSION" \
     --port 3307
 
 podman run \
     -d \
     --pod "bookstack" \
-    --name "$APP_CONTAINER_NAME" \
+    --name "bookstack_app" \
     --env-file "$ENV_FILE_DIR"/bookstack-app.env \
     --mount type=bind,source="$APP_DATA_DIR"/bookstack-app,target=/config \
-    "$APP_IMAGE_NAME:$IMAGE_VERSION"
+    "spad-bookstack-app:$IMAGE_VERSION"