Merged in feature/generate (pull request #58)

Compose Generate file

* genfile

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

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:

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