Merge pull request #288 from IFRCGo/staging

Staging

Author: jajaramillo24

.github/workflows/production-pipeline.yml

@@ -29,6 +29,7 @@ jobs:
                   username: ${{ secrets.REGISTRY_USERNAME }}
                   password: ${{ secrets.REGISTRY_PASSWORD }}
             - run: |
+                  cp swagger.prod .env
                   docker build -t ${{ secrets.REGISTRY_LOGIN_SERVER }}/whatnow:${{ github.sha }} -f ./docker/Dockerfile .
                   docker tag ${{ secrets.REGISTRY_LOGIN_SERVER }}/whatnow:${{ github.sha }} ${{ secrets.REGISTRY_LOGIN_SERVER }}/whatnow:latest
 

.github/workflows/qa-pipeline.yml

@@ -34,6 +34,7 @@ jobs:
                   username: ${{ secrets.REGISTRY_USERNAME }}
                   password: ${{ secrets.REGISTRY_PASSWORD }}
             - run: |
+                  cp swagger.qa .env
                   docker build -t ${{ secrets.REGISTRY_LOGIN_SERVER }}/whatnow-qa:${{ github.sha }} -f ./docker/Dockerfile .
                   docker tag ${{ secrets.REGISTRY_LOGIN_SERVER }}/whatnow-qa:${{ github.sha }} ${{ secrets.REGISTRY_LOGIN_SERVER }}/whatnow-qa:latest
 

config/app.php

@@ -19,6 +19,8 @@
     'url' => env('APP_URL', 'http://localhost'),
 
 
+    'api_url' => env('API_URL', 'http://localhost'),
+
 
     'timezone' => 'UTC',
 

config/l5-swagger.php

@@ -234,6 +234,6 @@
     |--------------------------------------------------------------------------
      */
     'constants' => [
-        'L5_SWAGGER_CONST_HOST' => config('app.url') . '/api',
+        'L5_SWAGGER_CONST_HOST' => env('SWAGGER_URL', null),
     ],
 ];

helm-chart-backoffice/values-production.yaml

@@ -18,6 +18,7 @@ env:
     APP_DEBUG: false
     APP_LOG_LEVEL: info
     APP_URL: https://preparemessages.ifrc.org
+    API_URL: https://api-preparemessages.ifrc.org
     GOOGLE_MAPS_KEY:
     DB_CONNECTION: mysql
     DB_PORT: 3306

helm-chart-backoffice/values-staging.yaml

@@ -18,6 +18,7 @@ env:
     APP_DEBUG: true
     APP_LOG_LEVEL: debug
     APP_URL: https://preparemessages-stage.ifrc.org
+    API_URL: https://api-preparemessages-stage.ifrc.org
     GOOGLE_MAPS_KEY:
     DB_CONNECTION: mysql
     DB_PORT: 3306

resources/views/scripts.blade.php

@@ -3,7 +3,7 @@
 $config = [
     'appName' => config('app.name'),
     'url' => config('app.url'),
-    'api_url'=> config('rcnapi.url'),
+    'api_url'=> config('app.api_url'),
     'appEnv' => config('app.env'),
     'locale' => $locale = app()->getLocale(),
     'locales' => config('app.locales'),

swagger.prod

@@ -0,0 +1 @@
+SWAGGER_URL=https://preparemessages.ifrc.org

swagger.qa

@@ -0,0 +1 @@
+SWAGGER_URL=https://preparemessages-stage.ifrc.org