From 22f63fd9515d9f754b54712042db5770c805a9b9 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 10 Oct 2019 20:36:55 +0200
Subject: [PATCH] Remove references to unused Docker variable

---
 .deploy/heroku/.env.heroku               |  1 -
 .deploy/sandstorm/.env.sandstorm         |  1 -
 .env.example                             |  1 -
 app/Http/Controllers/DebugController.php |  3 +--
 app/Http/Middleware/Range.php            | 18 ------------------
 config/firefly.php                       |  1 -
 resources/views/v1/debug.twig            |  1 -
 7 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/.deploy/heroku/.env.heroku b/.deploy/heroku/.env.heroku
index 804b7f6fc1..c0fb83278b 100644
--- a/.deploy/heroku/.env.heroku
+++ b/.deploy/heroku/.env.heroku
@@ -176,7 +176,6 @@ PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-IS_DOCKER=false
 IS_SANDSTORM=false
 IS_HEROKU=true
 BUNQ_USE_SANDBOX=false
diff --git a/.deploy/sandstorm/.env.sandstorm b/.deploy/sandstorm/.env.sandstorm
index 8a393750fd..60a4352d31 100755
--- a/.deploy/sandstorm/.env.sandstorm
+++ b/.deploy/sandstorm/.env.sandstorm
@@ -171,7 +171,6 @@ PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-IS_DOCKER=false
 IS_SANDSTORM=true
 IS_HEROKU=false
 BUNQ_USE_SANDBOX=false
diff --git a/.env.example b/.env.example
index b4669a480d..4dbe7b237f 100644
--- a/.env.example
+++ b/.env.example
@@ -178,7 +178,6 @@ PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-IS_DOCKER=false
 USE_ENCRYPTION=false
 IS_SANDSTORM=false
 IS_HEROKU=false
diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php
index cd49ca989b..17c82116d7 100644
--- a/app/Http/Controllers/DebugController.php
+++ b/app/Http/Controllers/DebugController.php
@@ -127,7 +127,6 @@ class DebugController extends Controller
         $currentDriver  = DB::getDriverName();
         $userAgent      = $request->header('user-agent');
         $isSandstorm    = var_export(config('firefly.is_sandstorm'), true);
-        $isDocker       = var_export(config('firefly.is_docker'), true);
         $toSandbox      = var_export(config('firefly.bunq_use_sandbox'), true);
         $trustedProxies = config('firefly.trusted_proxies');
         $displayErrors  = ini_get('display_errors');
@@ -178,7 +177,7 @@ class DebugController extends Controller
             'debug', compact(
                        'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers',
                        'currentDriver', 'loginProvider', 'storageDisks',
-                       'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isDocker', 'isSandstorm',
+                       'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isSandstorm',
                        'trustedProxies',
                        'toSandbox'
                    )
diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php
index 1734ce8aa0..36101d6f8c 100644
--- a/app/Http/Middleware/Range.php
+++ b/app/Http/Middleware/Range.php
@@ -53,8 +53,6 @@ class Range
             // set more view variables:
             $this->configureList();
 
-            // flash a big fat warning when users use SQLite in Docker
-            $this->loseItAll($request);
         }
 
         return $next($request);
@@ -104,22 +102,6 @@ class Range
         app('view')->share('defaultCurrency', $defaultCurrency);
     }
 
-    /**
-     * Error when sqlite in docker.
-     *
-     * @param Request $request
-     */
-    private function loseItAll(Request $request): void
-    {
-        if ('sqlite' === config('database.default') && true === config('firefly.is_docker')) {
-            // @codeCoverageIgnoreStart
-            $request->session()->flash(
-                'error', 'You seem to be using SQLite in a Docker container. Don\'t do this. If the container restarts all your data will be gone.'
-            );
-            // @codeCoverageIgnoreEnd
-        }
-    }
-
     /**
      * Set the range for the current view.
      */
diff --git a/config/firefly.php b/config/firefly.php
index 48fa70d169..3c871e4f60 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -135,7 +135,6 @@ return [
     'demo_username'                => env('DEMO_USERNAME', ''),
     'demo_password'                => env('DEMO_PASSWORD', ''),
     'is_sandstorm'                 => env('IS_SANDSTORM', 'unknown'),
-    'is_docker'                    => env('IS_DOCKER', 'unknown'),
     'bunq_use_sandbox'             => env('BUNQ_USE_SANDBOX', false),
     'fixer_api_key'                => env('FIXER_API_KEY', ''),
     'mapbox_api_key'               => env('MAPBOX_API_KEY', ''),
diff --git a/resources/views/v1/debug.twig b/resources/views/v1/debug.twig
index e34ea72fff..d1162d4827 100644
--- a/resources/views/v1/debug.twig
+++ b/resources/views/v1/debug.twig
@@ -42,7 +42,6 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
 | Using Sandstorm? | {% if SANDSTORM == true %}yes{% else %}no{% endif %} |
 {% if SANDSTORM == true %}| Sandstorm anon? | {% if SANDSTORM_ANON == true %}yes{% else %}no{% endif %} |{% endif %}
 | Is Sandstorm (.env) | {{ isSandstorm }} |
-| Is Docker (.env) | {{ isDocker }} |
 | bunq uses sandbox | {{ toSandbox }} |
 | Trusted proxies (.env) | {{ trustedProxies }} |
 | User agent | {{ userAgent }} |