Fix webserver & images

paulius-adamonis · Aug 15, 2018 · 09d0af7 · 09d0af7
1 parent 4948f4e
commit 09d0af7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 21 deletions.
diff --git a/config/packages/_sylius.yaml b/config/packages/_sylius.yaml
@@ -6,6 +6,9 @@ imports:
 
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
 
+parameters:
+    sylius_core.public_dir: '%kernel.project_dir%/public'
+
 sylius_shop:
     product_grid:
         include_all_descendants: true
diff --git a/config/packages/knp_gaufrette.yaml b/config/packages/knp_gaufrette.yaml
diff --git a/config/packages/liip_imagine.yaml b/config/packages/liip_imagine.yaml
diff --git a/public/index.php b/public/index.php
@@ -7,15 +7,15 @@
 require __DIR__.'/../vendor/autoload.php';
 
 // The check is to ensure we don't use .env in production
-if (!isset($_SERVER['APP_ENV'])) {
+if (!isset($_SERVER['APP_ENV']) && !isset($_ENV['APP_ENV'])) {
     if (!class_exists(Dotenv::class)) {
         throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
     }
     (new Dotenv())->load(__DIR__.'/../.env');
 }
 
-$env = $_SERVER['APP_ENV'] ?? 'dev';
-$debug = (bool) ($_SERVER['APP_DEBUG'] ?? ('prod' !== $env));
+$env = $_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? 'dev';
+$debug = (bool) ($_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? ('prod' !== $env));
 
 if ($debug) {
     umask(0000);

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml
@@ -23,6 +23,9 @@ imports:
     - { resource: "@SyliusCoreBundle/Resources/config/app/state_machine.yml" }
     - { resource: "@SyliusCoreBundle/Resources/config/app/fixtures.yml" }
 
+parameters:
+    sylius_core.public_dir: "%kernel.project_dir%/web"
+
 doctrine:
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
@@ -38,7 +41,7 @@ knp_gaufrette:
     adapters:
         sylius_image:
             local:
-                directory: "%kernel.project_dir%/web/media/image"
+                directory: "%sylius_core.public_dir%/media/image"
                 create: true
     filesystems:
         sylius_image:
@@ -48,7 +51,12 @@ liip_imagine:
     loaders:
         default:
             filesystem:
-                data_root: "%kernel.project_dir%/web/media/image"
+                data_root: "%sylius_core.public_dir%/media/image"
+    resolvers:
+        default:
+            web_path:
+                web_root: "%sylius_core.public_dir%"
+                cache_prefix: "media/cache"
     filter_sets:
         sylius_small:
             filters: