Omgevingen hernoemen naar acceptance en production t.b.v. Datapunt

Amsterdam

README.md

@@ -62,7 +62,8 @@ Gebruik Apache met mod-php, Apache met PHP-FPM, Nginx met PHP-FPM of IIS. Gebrui
     git clone [email protected]:amsterdam/fixxx-schuldhulp.git
     cd fixxx-schuldhulp
     composer install
-    php bin/console cache:clear --env=prod
+    php bin/console cache:clear --env=acceptance
+    php bin/console cache:clear --env=production
 
 Configueer tenslote een vhost van de webserver. Zie ook de specifieke handleiding per webserver [in de Symfony 4.0 handleiding](http://symfony.com/doc/current/setup/web_server_configuration.html)
 

bin/console

@@ -24,7 +24,7 @@ if (!isset($_SERVER['APP_ENV'])) {
 
 $input = new ArgvInput();
 $env = $input->getParameterOption(['--env', '-e'], $_SERVER['APP_ENV'] ?? 'dev', true);
-$debug = ($_SERVER['APP_DEBUG'] ?? ('prod' !== $env)) && !$input->hasParameterOption('--no-debug', true);
+$debug = ($_SERVER['APP_DEBUG'] ?? ('production' !== $env)) && !$input->hasParameterOption('--no-debug', true);
 
 if ($debug) {
     umask(0000);

config/packages/production/doctrine.yaml

@@ -0,0 +1,31 @@
+doctrine:
+    orm:
+        metadata_cache_driver:
+            type: service
+            id: doctrine.system_cache_provider
+        query_cache_driver:
+            type: service
+            id: doctrine.system_cache_provider
+        result_cache_driver:
+            type: service
+            id: doctrine.result_cache_provider
+
+services:
+    doctrine.result_cache_provider:
+        class: Symfony\Component\Cache\DoctrineProvider
+        public: false
+        arguments:
+            - '@doctrine.result_cache_pool'
+    doctrine.system_cache_provider:
+        class: Symfony\Component\Cache\DoctrineProvider
+        public: false
+        arguments:
+            - '@doctrine.system_cache_pool'
+
+framework:
+    cache:
+        pools:
+            doctrine.result_cache_pool:
+                adapter: cache.app
+            doctrine.system_cache_pool:
+                adapter: cache.system

docker-compose.yml

@@ -17,6 +17,6 @@ services:
     links:
       - database
     environment:
-      - APP_ENV=prod
+      - APP_ENV=production
       - APP_SECRET=secret
       - DATABASE_URL=pgsql://schuldhulp:insecure@database:5432/schuldhulp

docker-entrypoint.sh

@@ -5,7 +5,8 @@ echo 'Start docker-entrypoint.sh'
 set -u
 
 composer install --no-interaction --no-suggest --prefer-dist
-php bin/console cache:clear --env=prod
+php bin/console cache:clear --env=production
+php bin/console cache:clear --env=acceptance
 php bin/console cache:clear --env=dev
 chown -R www-data:www-data var
 

public/index.php

@@ -16,7 +16,7 @@
 }
 
 $env = $_SERVER['APP_ENV'] ?? 'dev';
-$debug = $_SERVER['APP_DEBUG'] ?? ('prod' !== $env);
+$debug = $_SERVER['APP_DEBUG'] ?? ('production' !== $env);
 
 if ($debug) {
     umask(0000);