refactor: extract commands from Makefile to bash scripts

Author: abhisheksr01

.dockerignore

@@ -1,2 +1,3 @@
 .git
-__pycache__
+__pycache__
+./scripts

.gitignore

@@ -159,5 +159,6 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
+Instructions.md
 
-Instructions.md
+.idea

Makefile

@@ -24,8 +24,10 @@ help: ##@target Show target help options.
 	@perl -e '$(HELP_FUN)' $(MAKEFILE_LIST)
 
 start-app-db: FORCE ##@target Starts the app and db with sample data dump
-	docker compose up -d ;\
-	docker compose exec db /bin/bash ./opt/upload.sh
+	./scripts/start.sh
+
+stop-app-db: FORCE ##@target stops the app and db with sample data dump
+	docker compose down && docker container prune -f && docker rmi abhisheksr01/python-postgres-azure:0.0.1 -f && docker ps -a
 
 clear: FORCE ##@target Clears the "__pycache__" & ".pytest_cache". Will be required to run twice.
 	@find . -name "__pycache__" -exec rm -rf {} \;

db/upload.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-psql -h localhost -U postgres < ./opt/rates.sql
-psql -h localhost -U postgres -c "SELECT 'alive'"
-psql -h localhost -U postgres -c "SELECT current_database();"

docker-compose.yml

@@ -3,6 +3,7 @@ version: '3'
 services:
   app:
     image: 'abhisheksr01/python-postgres-azure:0.0.1'
+    restart: on-failure
     build:
       context: .
     container_name: app
@@ -24,4 +25,5 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=secret
     volumes:
-      - ./db/:/opt/
+      - ./db/:/opt/
+      - ./scripts/upload.sh:/opt/upload.sh

scripts/start.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+echo "** Starting the app and db"
+docker compose up -d
+echo "** Sleeping for 10 sec to ensure db services are running before uploading dump data"
+sleep 10
+echo "** Uploading dump data & then sleeping for 5 sec **"
+docker compose exec db /bin/bash ./opt/upload.sh
+sleep 5
+echo "Performing Health Check on the App"
+curl "http://127.0.0.1:3000/"

scripts/upload.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+psql -h localhost -U postgres < ./opt/rates.sql
+psql -h localhost -U postgres -c "SELECT 'alive'"
+psql -h localhost -U postgres -c "SELECT current_database();"