Merge remote-tracking branch 'origin/master'

ConductionNL · Jan 14, 2020 · f7c5f51 · f7c5f51
2 parents 06ee770 + 66d1d52
commit f7c5f51
Show file tree

Hide file tree

Showing 21 changed files with 769 additions and 537 deletions.
diff --git a/api/config/bundles.php b/api/config/bundles.php
@@ -1,20 +1,20 @@
 <?php
 
 return [
-    Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
-    Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
-    Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true],
-    Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
-    Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
-    ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
-    Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
-    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
-    Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
-    Conduction\CommonGroundBundle\CommonGroundBundle::class => ['all' => true],
-    Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
+    Symfony\Bundle\FrameworkBundle\FrameworkBundle::class                    => ['all' => true],
+    Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class     => ['all' => true],
+    Symfony\Bundle\SecurityBundle\SecurityBundle::class                      => ['all' => true],
+    Symfony\Bundle\MercureBundle\MercureBundle::class                        => ['all' => true],
+    Symfony\Bundle\TwigBundle\TwigBundle::class                              => ['all' => true],
+    Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class                     => ['all' => true],
+    ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class          => ['all' => true],
+    Nelmio\CorsBundle\NelmioCorsBundle::class                                => ['all' => true],
+    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class                => ['dev' => true, 'test' => true],
+    Symfony\Bundle\MakerBundle\MakerBundle::class                            => ['dev' => true],
+    Conduction\CommonGroundBundle\CommonGroundBundle::class                  => ['all' => true],
+    Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class        => ['all' => true],
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
-    Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['all' => true],
-    Tbbc\MoneyBundle\TbbcMoneyBundle::class => ['all' => true],
-    Knp\Bundle\MarkdownBundle\KnpMarkdownBundle::class => ['all' => true],
+    Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class             => ['all' => true],
+    Tbbc\MoneyBundle\TbbcMoneyBundle::class                                  => ['all' => true],
+    Knp\Bundle\MarkdownBundle\KnpMarkdownBundle::class                       => ['all' => true],
 ];
diff --git a/api/helm/values.yaml b/api/helm/values.yaml
@@ -10,7 +10,7 @@ settings:
   version: V.0.1
   description: '&#039;Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.&#039;'
   repro: 'https://github.com/ConductionNL/verzoektypecatalogus'
-  subdomain:   
+  subdomain: vtc  
   domains:
     - conduction.nl
     - zaakonline.nl
@@ -48,7 +48,7 @@ settings:
 
 
 php:
-  repository: docker.io/conduction/vtc-php
+  repository: docker.io/conduction/protocomponent-php
   tag: latest
   mercure:
     jwtSecret: ""
@@ -64,7 +64,7 @@ nginx:
 varnish:
   enabled: true
   #url: https://example.com
-  repository: docker.io/conduction/vtc-varnish
+  repository: docker.io/conduction/protocomponent-varnish
   tag: latest
   pullPolicy: Always
   replicaCount: 1

diff --git a/api/public/schema/Datamodel_Modelio.zip b/api/public/schema/Datamodel_Modelio.zip