Merged in feature/testingopts (pull request #129)

Testing Options and Clean Up

* bitsandbobs

* lint

* healthchecks

* imgintests

* singlegenerate

* testclean

* network

* networkclean

* cmds

deployments/compose.aws.yaml

@@ -394,10 +394,10 @@ services:
     volumes:
       - aws-db-data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${PGUSER}"]
-      interval: 10s
+      test: ["CMD", "sh", "-c", "pg_isready -U ${PGUSER} && psql -U ${PGUSER} -c 'SELECT 1'"]
+      interval: 500ms
       timeout: 5s
-      retries: 5
+      retries: 50
     networks:
       - aws-server-network
 
@@ -419,9 +419,9 @@ services:
       - 4566
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:4566/_localstack/health"]
-      interval: 5s
+      interval: 500ms
       timeout: 5s
-      retries: 10
+      retries: 50
     networks:
       - aws-server-network
 

deployments/compose.generate.yaml

@@ -10,16 +10,12 @@ services:
       POSTGRES_USER: ${PGUSER}
     expose:
       - 5431
-    volumes:
-      - generate-db-data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${PGUSER}"]
-      interval: 10s
+      test: ["CMD", "sh", "-c", "pg_isready -U ${PGUSER} && psql -U ${PGUSER} -c 'SELECT 1'"]
+      interval: 500ms
       timeout: 5s
-      retries: 5
+      retries: 50
     networks:
       - generate-server-network
-volumes:
-  generate-db-data:
 networks:
   generate-server-network:

deployments/compose.local.yaml

@@ -286,10 +286,6 @@ services:
       COGNITO_CLIENT_SECRET: "fillin"
       COGNITO_DOMAIN: "fillin"
       COGNITO_CLIENT_ID: "fillin"
-      # COGNITO_USER_POOL_ID: ${COGNITO_USER_POOL_ID}
-      # COGNITO_CLIENT_SECRET: ${COGNITO_CLIENT_SECRET}
-      # COGNITO_DOMAIN: ${COGNITO_DOMAIN}
-      # COGNITO_CLIENT_ID: ${COGNITO_CLIENT_ID}
     networks:
       - server-network
 
@@ -393,10 +389,10 @@ services:
     volumes:
       - db-data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${PGUSER}"]
-      interval: 10s
+      test: ["CMD", "sh", "-c", "pg_isready -U ${PGUSER} && psql -U ${PGUSER} -c 'SELECT 1'"]
+      interval: 500ms
       timeout: 5s
-      retries: 5
+      retries: 50
     networks:
       - server-network
 
@@ -418,9 +414,9 @@ services:
       - 4566
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:4566/_localstack/health"]
-      interval: 5s
+      interval: 500ms
       timeout: 5s
-      retries: 10
+      retries: 50
     networks:
       - server-network
 

deployments/compose.test.yaml

@@ -13,10 +13,10 @@ services:
     volumes:
       - test-db-data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${PGUSER}"]
-      interval: 10s
+      test: ["CMD", "sh", "-c", "pg_isready -U ${PGUSER} && psql -U ${PGUSER} -c 'SELECT 1'"]
+      interval: 500ms
       timeout: 5s
-      retries: 5
+      retries: 50
     networks:
       - test-server-network