diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php
index 5327c96..f20d20d 100644
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -7,7 +7,10 @@ class Home extends BaseController
public function index(): string
{
$data["config_name"] = $_ENV['CONFIG_NAME'];
- /// return view('welcome_message',$data);
- return view('live_welcome_message',$data);
+ if ($_ENV['CI_ENV'] === 'production') {
+ return view('live_welcome_message', $data);
+ } else {
+ return view('welcome_message', $data);
+ }
}
}
diff --git a/app/Controllers/Media.php b/app/Controllers/Media.php
index 9bf09f3..69497b3 100644
--- a/app/Controllers/Media.php
+++ b/app/Controllers/Media.php
@@ -9,7 +9,6 @@ class Media extends BaseController
public function index(): void
{
-
$target_file = "/var/www/html/SITEFILES/TEST/test.jpg";
$filename = $target_file;
$file_extension = strtolower(substr(strrchr($filename, "."), 1));
diff --git a/app/Views/live_welcome_message.php b/app/Views/live_welcome_message.php
index c7825c2..3316245 100644
--- a/app/Views/live_welcome_message.php
+++ b/app/Views/live_welcome_message.php
@@ -59,7 +59,7 @@
diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php
index 519553a..9bc23fc 100644
--- a/app/Views/welcome_message.php
+++ b/app/Views/welcome_message.php
@@ -59,7 +59,7 @@
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index 79bd4ca..2fd07cb 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -10,7 +10,7 @@ services:
- APACHE_RUN_USER=#${UID}
- APACHE_RUN_GROUP=#${UID}
- CI_ENVIRONMENT=production
- - CI_ENV=${CI_ENV:-production}
+ - CI_ENV=production
- CI_CONFIG
- MAIN_DATABASE_IP=10.13.3.60
- MAIN_DATABASE_USERNAME=merms_panel
@@ -18,6 +18,7 @@ services:
- MAIN_DATABASE=merms_panel
- MAIN_DATABASE_PORT=5432
- UPLOAD_FOLDER=/var/www/html/uploads/LIVE
+ - CONFIG_NAME='LV'
restart: unless-stopped
image: registry.chiefsoft.net/mermsprovision:latest
volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 05fd9d5..4e4a5cb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,8 +10,9 @@ services:
- APACHE_RUN_USER=#${UID}
- APACHE_RUN_GROUP=#${UID}
- CI_ENVIRONMENT=development
- - CI_ENV=${CI_ENV:-development}
+ - CI_ENV=development
- CI_CONFIG
+ - CONFIG_NAME='DV'
restart: unless-stopped
image: registry.chiefsoft.net/merms-media:latest
volumes: