Fix shell script formatting

scripts/prod/CreateBackup.sh

@@ -2,51 +2,51 @@
 # WARNING! DO NOT RUN THIS FILE AUTOMATICALLY FROM REPOSITORY LOCATION!
 # Create a copy in secure location @production host. Update backup scripts from repository manually
 # ========================================
+BACKUP_LOCATION="/home/prod/backup"
+POSTGRE_USER="portal-admin"
+POSTGRE_DB="portal-db"
+CONTAINER_DB="portal-db"
+CONTAINER_BACK="portal-backend"
 
-backupLocation="/home/prod/backup"
+DATE_FORMATTED=$(date '+%Y-%m-%d')
-pgUser="portal-admin"
+DESTINATION="${BACKUP_LOCATION}/${DATE_FORMATTED}"
-pgDB="portal-db"
-containerDB="portal-db"
-containerBackend="portal-backend"
 
-dateFmt=$(date '+%Y-%m-%d')
+ensure_location() {
-destination="$backupLocation/$dateFmt"
+  rm -rf $DESTINATION
-
+  mkdir $DESTINATION
-EnsureLocation()
-{
-  rm -rf $destination
-  mkdir $destination
 }
 
-PostgreDump()
+dump_postgre() {
-{
+  DB_DUMP_FILE="${DESTINATION}/${DATE_FORMATTED}-db.dump"
-  dbDump="$destination/$dateFmt-db.dump"
+  docker exec $CONTAINER_DB pg_dump \
-  docker exec $containerDB pg_dump \
+    --username=$POSTGRE_USER \
-    --username=$pgUser \
     --exclude-table=django_migrations \
     --format=custom \
-    --dbname=$pgDB \
+    --dbname=$POSTGRE_DB \
-	> $dbDump
+	> $DB_DUMP_FILE
 }
 
-DjangoDump()
+dump_django() {
-{
+  DATA_DUMP_FILE="${DESTINATION}/${DATE_FORMATTED}-data.json"
-  dataDump="$destination/$dateFmt-data.json"
+  docker exec $CONTAINER_BACK \
-  docker exec $containerBackend \
     python manage.py dumpdata \
       --indent=2 \
       --exclude=admin.LogEntry \
       --exclude=sessions \
       --exclude=contenttypes \
       --exclude=auth.permission \
-      > $dataDump
+      > $DATA_DUMP_FILE
-  gzip --force $dataDump
+  gzip --force $DATA_DUMP_FILE
 }
 
-EnsureLocation
+create_backup() {
-PostgreDump
+  ensure_location
-DjangoDump
+  dump_postgre
+  dump_django
 
-green="\033[0;32m"
+  green="\033[0;32m"
-noColor='\033[0m'
+  noColor='\033[0m'
-echo -e "${green}Backup created at: ${destination}${noColor}"
+  echo -e "${green}Backup created at: ${DESTINATION}${noColor}"
+}
+
+create_backup

scripts/prod/UpdateProd.sh

@@ -1,4 +1,5 @@
+git reset --hard
 git pull
 /bin/bash ./scripts/prod/CreateBackup.sh
-docker compose -f "docker-compose-prod.yml" up --build -d
+docker compose --file "docker-compose-prod.yml" up --build --detach
-docker image prune -a -f
+docker image prune --all --force