Merge pull request #32 from nspalo/webstack/docker-nginx-php74-mysql5…

…7-no-laravel webstack/docker-nginx-php74-mysql57-no-laravel
nspalo · Aug 25, 2022 · d2af171 · d2af171
2 parents 167192e + 92467c3
commit d2af171
Show file tree

Hide file tree

Showing 91 changed files with 25 additions and 32,490 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,8 @@
 - npm
   - Node 16 alpine
 - artisan
-  - Laravel5.8
+  - No Laravel - Open to install desired version  
+    - _NOTE: With laravel 6 and above, some configurations might need adjustments._ 
 
 ## Set Up Procedure
 > **Note:**  
@@ -28,16 +29,27 @@
 >
 > _See: `docker/docker-compose.yml` for the list of service containers_
  
-### Step 0: Environment File Config
+### Step 0: Environment File Configurations
 Note:  
-_This will soon be updated and improved to support multi-environment set up and load the correct file automatically  
-So for now, its just_ `local.env`.    
-- _see:_ `docker/environments/local.env` to set up your configs and credentials for this file  
+_In here we will use a file with `.env` extension to support multi-environment set up and load the correct variable values automatically. 
+For now, its just_ `local.env` but feel free to add more depending on the need like `staging.env`, `uat.env`, `test.env`, `prod.env` and the likes.    
+- _see:_ `docker/environments/local.env` to set up your configs and credentials for this file.  
   - Take note that some values in this file will be use later on by laravel `.env` and our `config.env` file.  
 
-The generic `.env` file `config.env` should be always be use in the command and use the variable `SYS_ENV` to set the specific environment file configuration.
+The generic `.env` file `config.env` should always be used in the command and should use the variable `SYS_ENV` to set the specific environment file configuration.
 - _see:_ `docker/environments/config.env`
 
+### Step 0.5: Laravel Installation 
+> **_Note:_** Since this is a No Laravel, in this step we will install a selected laravel version.   
+> _DO NOT REPLACE the "src" directory or if needed, edit the config file and change the value of `PATH_PROJECT_SOURCE` variable._     
+> **_Format:_** composer create-project --prefer-dist laravel/laravel src <_LaravelVersion_>  
+> **_E.g.:_** `composer create-project --prefer-dist laravel/laravel src "5.6.*"`
+```
+// Installing selected Laravel version
+// The command below will install laravel 5.8 to src directory
+> composer create-project --prefer-dist laravel/laravel src "5.8.*"
+```
+
 ### Step 1: Service containers - Building and Starting
 ```
 // Building the services/containers

diff --git a/docker/README.md b/docker/README.md
@@ -44,6 +44,12 @@ docker rmi -f $(docker images -q)
 docker system prune -a
 ```
 
+### Laravel Installation
+```
+// The command below will install laravel 5.8 to src directory
+> composer create-project --prefer-dist laravel/laravel src "5.8.*"
+```
+
 ### Building the service containers
 ```
 // Build the services/containers

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -94,7 +94,7 @@ services:
     build:
       context: .
       dockerfile: containers/php/Dockerfile
-    image: artisan:laravel-5.8
+    image: artisan:laravel
     env_file:
       - ${PATH_ENV_CONFIGS}/config.env
       - ${PATH_ENV_CONFIGS}/${SYS_ENV}.env

diff --git a/src/.editorconfig b/src/.editorconfig
diff --git a/src/.env.example b/src/.env.example
diff --git a/src/.gitattributes b/src/.gitattributes
diff --git a/src/.gitignore b/src/.gitignore
diff --git a/src/.styleci.yml b/src/.styleci.yml
diff --git a/src/app/Console/Kernel.php b/src/app/Console/Kernel.php
diff --git a/src/app/Exceptions/Handler.php b/src/app/Exceptions/Handler.php
diff --git a/src/app/Http/Controllers/Auth/ForgotPasswordController.php b/src/app/Http/Controllers/Auth/ForgotPasswordController.php
diff --git a/src/app/Http/Controllers/Auth/LoginController.php b/src/app/Http/Controllers/Auth/LoginController.php