Merge f9bdc8b124 into 525b1d29f0

README.md

@@ -104,6 +104,7 @@ If you already have at least version 2.0 installed:
 docker run \
   -p 8000:8000\
   -e APP_URL=https://... \
+  -e APP_FORCE_SSL=true \
   -e DB_HOST=... \
   -e DB_DATABASE=... \
   -e DB_USERNAME=... \

app/Providers/RouteServiceProvider.php

@@ -35,7 +35,7 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-	if (config('app.env') === 'production') {
+	if (config('app.force_ssl')) {
 			\Illuminate\Support\Facades\URL::forceScheme('https');
 	}
         $this->configureRateLimiting();

config/app.php

@@ -27,6 +27,7 @@ return [
     */
 
     'env' => env('APP_ENV', 'production'),
+    'force_ssl' => (bool) env('APP_FORCE_SSL', false),
 
     /*
     |--------------------------------------------------------------------------

run.sh

@@ -13,7 +13,8 @@ DB_HOST=${DB_HOST}
 DB_DATABASE=${DB_DATABASE}
 DB_USERNAME=${DB_USERNAME}
 DB_PASSWORD=${DB_PASSWORD}
-APP_URL=${APP_URL}
+APP_URL=${APP_URL:-http://localhost:8000}
+APP_FORCE_SSL=${APP_FORCE_SSL:-false}
 EOF
 php artisan key:generate --no-interaction --force
 fi