Merge pull request #5 from techbizz-nepal/release-next

Align with main branch

Author: susantp

docker-compose.yaml

@@ -48,7 +48,7 @@ services:
     image: "${PROJECT_NAME}/mysql:1.0"
     build: ./mysql
     volumes:
-      - ./data/mysql:/var/lib/mysql
+      - ./mysql/data/project_db:/var/lib/mysql
       - ${MYSQL_ENTRYPOINT_INITDB}:/docker-entrypoint-initdb.d
     ports:
       - "3306:3306"
@@ -64,7 +64,7 @@ services:
     image: "${PROJECT_NAME}/test_db:1.0"
     build: ./mysql
     volumes:
-      - ./data/test_db:/var/lib/mysql
+      - ./mysql/data/test_db:/var/lib/mysql
       - ${MYSQL_ENTRYPOINT_INITDB}:/docker-entrypoint-initdb.d
     ports:
       - "3307:3306"

headers/app.h

@@ -1,12 +1,16 @@
 init_app(){
   install_packages
-
+  run_migrations
   if ! env_file_exists >> /dev/null 2>&1; then
     cp_env
     generate_key
   fi
 }
 
+run_migrations(){
+  docker-compose -f $DOCKER_COMPOSE_FILE_PATH exec app php artisan migrate
+}
+
 install_packages(){
   docker-compose -f $DOCKER_COMPOSE_FILE_PATH exec app composer install
 }

prepare_context.sh

@@ -30,10 +30,19 @@ if ! [ -f "$NGINX_REAL_SITE_PATH" ]; then
 fi
 printf "nginx site file looks ok.\n\n"
 
-
-if [ "$FIRST_ARG" = "build" ]; then
+printf "Validating main db file...\n\n"
+if ! [ -f "$MAIN_DB_FILE_PATH" ]; then
   create_sql_file_if_not_exist "$MYSQL_ENTRY_POINT_CREATE_MAIN_DB_CONTENT" "$MAIN_DB_FILE_PATH"
+  printf "main db file validated.\n\n"
+fi
+printf "Validating test db file...\n\n"
+if ! [ -f "$TEST_DB_FILE_PATH" ]; then
   create_sql_file_if_not_exist "$MYSQL_ENTRY_POINT_CREATE_TEST_DB_CONTENT" "$TEST_DB_FILE_PATH"
+  printf "test db file validated.\n\n"
+fi
+printf "db files looks ok.\n\n"
+
+if [ "$FIRST_ARG" = "build" ]; then
   docker_down
   docker_build
   docker_up