From 506340bc62c1eddbecf1148dd25702316fea9122 Mon Sep 17 00:00:00 2001
From: Michael McGuinness <mmcguinness@aarete.com>
Date: Tue, 11 Feb 2025 16:00:30 +0000
Subject: [PATCH] Merged in feature/generate (pull request #58)

Compose Generate file

* genfile
---
 deployments/compose.generate.yaml | 25 +++++++++++++++++++++++
 scripts/Taskfile.yml              |  2 +-
 scripts/database.yml              |  2 +-
 scripts/local-deployments.yml     | 34 +++++++++++++++++++++++--------
 4 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 deployments/compose.generate.yaml

diff --git a/deployments/compose.generate.yaml b/deployments/compose.generate.yaml
new file mode 100644
index 00000000..69343d10
--- /dev/null
+++ b/deployments/compose.generate.yaml
@@ -0,0 +1,25 @@
+---
+services:
+  test-db:
+    image: postgres:17.2-alpine3.21
+    ports:
+      - 5430:5432
+    environment:
+      POSTGRES_DB: ${DB_NAME}
+      POSTGRES_PASSWORD: ${DB_PASS}
+      POSTGRES_USER: ${DB_USER}
+    expose:
+      - 5430
+    volumes:
+      - test-db-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - test-server-network
+volumes:
+  test-db-data:
+networks:
+  test-server-network:
diff --git a/scripts/Taskfile.yml b/scripts/Taskfile.yml
index b8020c36..6dc53a8a 100644
--- a/scripts/Taskfile.yml
+++ b/scripts/Taskfile.yml
@@ -34,7 +34,7 @@ tasks:
   fullsuite:
     cmds:
       - task: deps:tidy
-      - task: compose:clean:test
+      - task: compose:clean:generate
       - task: generate
       - task: build:nogen
       - task: lint:nogen
diff --git a/scripts/database.yml b/scripts/database.yml
index fb98d3fc..79665660 100644
--- a/scripts/database.yml
+++ b/scripts/database.yml
@@ -15,7 +15,7 @@ tasks:
   deps:up:
     internal: true
     cmds:
-      - task compose:up:test
+      - task compose:up:generate
       - sleep 3
   lint:
     deps:
diff --git a/scripts/local-deployments.yml b/scripts/local-deployments.yml
index c0661f93..161adba4 100644
--- a/scripts/local-deployments.yml
+++ b/scripts/local-deployments.yml
@@ -6,6 +6,7 @@ version: '3'
 vars:
   LOCAL_COMPOSE_FILE: "deployments/compose.local.yaml"
   TEST_COMPOSE_FILE: "deployments/compose.test.yaml"
+  GENERATE_COMPOSE_FILE: "deployments/compose.test.yaml"
 
 tasks:
   build:test:
@@ -13,6 +14,11 @@ tasks:
       - task: build
         vars:
           COMPOSE_FILE: '{{.TEST_COMPOSE_FILE}}'
+  build:generate:
+    cmds:
+      - task: build
+        vars:
+          COMPOSE_FILE: '{{.GENERATE_COMPOSE_FILE}}'
   build:
     vars:
       COMPOSE_FILE: '{{.COMPOSE_FILE | default .LOCAL_COMPOSE_FILE}}'
@@ -21,6 +27,15 @@ tasks:
   up:test:
     cmds:
       - docker compose -f {{.TEST_COMPOSE_FILE}} up --no-recreate -d
+  up:generate:
+    cmds:
+      - docker compose -f {{.GENERATE_COMPOSE_FILE}} up --no-recreate -d
+  up:
+    cmds:
+      - task docker:build
+      - task: build
+      - docker compose -f {{.LOCAL_COMPOSE_FILE}} up --no-recreate -d
+      - task: init
   refresh:
     cmds:
       - task docker:build
@@ -28,12 +43,6 @@ tasks:
       - task: down
       - docker compose -f {{.LOCAL_COMPOSE_FILE}} up --no-recreate -d
       - task: init
-  up:
-    cmds:
-      - task docker:build
-      - task: build
-      - docker compose -f {{.LOCAL_COMPOSE_FILE}} up --no-recreate -d
-      - task: init
   init:
     cmds:
       - aws s3 mb s3://$BUCKET_IN
@@ -56,6 +65,11 @@ tasks:
       - task: down
         vars:
           COMPOSE_FILE: '{{.TEST_COMPOSE_FILE}}'
+  down:generate:
+    cmds:
+      - task: down
+        vars:
+          COMPOSE_FILE: '{{.GENERATE_COMPOSE_FILE}}'
   down:
     vars:
       COMPOSE_FILE: '{{.COMPOSE_FILE | default .LOCAL_COMPOSE_FILE}}'
@@ -64,11 +78,15 @@ tasks:
   clean:test:
     cmds:
       - task: down:test
-      - docker volume rm deployments_test-db-data
+      - docker volume rm -f deployments_test-db-data
+  clean:generate:
+    cmds:
+      - task: down:generate
+      - docker volume rm -f deployments_generate-db-data
   clean:
     cmds:
       - task: down
-      - docker volume rm deployments_db-data
+      - docker volume rm -f deployments_db-data
   lint:
     cmds:
       - docker compose -f {{.LOCAL_COMPOSE_FILE}} config -q