Migrate dev-specific configuration to env vars via .env file

shlinkio · Oct 16, 2024 · bf836ff · bf836ff
1 parent aef04af
commit bf836ff
Show file tree

Hide file tree

Showing 101 changed files with 475 additions and 543 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ docker-compose.override.yml
 .phpunit.result.cache
 docs/swagger/swagger-inlined.json
 phpcov*
+shlink-dev.local.env
diff --git a/config/autoload/delete_short_urls.global.php b/config/autoload/delete_short_urls.global.php
diff --git a/config/autoload/entity-manager.local.php.dist b/config/autoload/entity-manager.local.php.dist
diff --git a/config/autoload/matomo.global.php b/config/autoload/matomo.global.php
diff --git a/config/autoload/matomo.local.php.dist b/config/autoload/matomo.local.php.dist
diff --git a/config/autoload/mercure.global.php b/config/autoload/mercure.global.php
@@ -8,34 +8,31 @@
 use Symfony\Component\Mercure\Hub;
 use Symfony\Component\Mercure\HubInterface;
 
-return (static function (): array {
-    $publicUrl = EnvVars::MERCURE_PUBLIC_HUB_URL->loadFromEnv();
+return [
 
-    return [
+    // This config is used by shlink-common. Do not delete
+    'mercure' => [
+        'public_hub_url' => EnvVars::MERCURE_PUBLIC_HUB_URL->loadFromEnv(),
+        'internal_hub_url' => EnvVars::MERCURE_INTERNAL_HUB_URL->loadFromEnv(),
+        'jwt_secret' => EnvVars::MERCURE_JWT_SECRET->loadFromEnv(),
+        'jwt_issuer' => 'Shlink',
+    ],
 
-        'mercure' => [
-            'public_hub_url' => $publicUrl,
-            'internal_hub_url' => EnvVars::MERCURE_INTERNAL_HUB_URL->loadFromEnv(),
-            'jwt_secret' => EnvVars::MERCURE_JWT_SECRET->loadFromEnv(),
-            'jwt_issuer' => 'Shlink',
-        ],
-
-        'dependencies' => [
-            'delegators' => [
-                LcobucciJwtProvider::class => [
-                    LazyServiceFactory::class,
-                ],
-                Hub::class => [
-                    LazyServiceFactory::class,
-                ],
+    'dependencies' => [
+        'delegators' => [
+            LcobucciJwtProvider::class => [
+                LazyServiceFactory::class,
             ],
-            'lazy_services' => [
-                'class_map' => [
-                    LcobucciJwtProvider::class => LcobucciJwtProvider::class,
-                    Hub::class => HubInterface::class,
-                ],
+            Hub::class => [
+                LazyServiceFactory::class,
+            ],
+        ],
+        'lazy_services' => [
+            'class_map' => [
+                LcobucciJwtProvider::class => LcobucciJwtProvider::class,
+                Hub::class => HubInterface::class,
             ],
         ],
+    ],
 
-    ];
-})();
+];
diff --git a/config/autoload/mercure.local.php.dist b/config/autoload/mercure.local.php.dist
diff --git a/config/autoload/qr-codes.global.php b/config/autoload/qr-codes.global.php
diff --git a/config/autoload/rabbit.global.php b/config/autoload/rabbit.global.php
@@ -6,6 +6,7 @@
 
 return [
 
+    // This config is used by shlink-common. Do not delete
     'rabbitmq' => [
         'enabled' => (bool) EnvVars::RABBITMQ_ENABLED->loadFromEnv(),
         'host' => EnvVars::RABBITMQ_HOST->loadFromEnv(),

diff --git a/config/autoload/rabbit.local.php.dist b/config/autoload/rabbit.local.php.dist
diff --git a/config/autoload/redirects.global.php b/config/autoload/redirects.global.php
diff --git a/config/autoload/redis.local.php.local b/config/autoload/redis.local.php.local
diff --git a/config/autoload/robots.global.php b/config/autoload/robots.global.php
diff --git a/config/autoload/router.local.php.dist b/config/autoload/router.local.php.dist
@@ -7,7 +7,6 @@ use Mezzio\Router\FastRouteRouter;
 return [
 
     'router' => [
-//        'base_path' => '',
         'fastroute' => [
             FastRouteRouter::CONFIG_CACHE_ENABLED => false,
         ],

diff --git a/config/autoload/tracking.global.php b/config/autoload/tracking.global.php
diff --git a/config/autoload/url-shortener.local.php.dist b/config/autoload/url-shortener.local.php.dist
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -33,7 +33,11 @@ services:
             - shlink_rabbitmq
             - shlink_matomo
         environment:
-            LC_ALL: C
+            DEFAULT_DOMAIN: localhost:8000
+        env_file:
+            - path: shlink-dev.env
+            - path: shlink-dev.local.env
+              required: false
         extra_hosts:
             - 'host.docker.internal:host-gateway'
 
@@ -59,7 +63,11 @@ services:
             - shlink_rabbitmq
             - shlink_matomo
         environment:
-            LC_ALL: C
+            DEFAULT_DOMAIN: localhost:8800
+        env_file:
+            - path: shlink-dev.env
+            - path: shlink-dev.local.env
+              required: false
         extra_hosts:
             - 'host.docker.internal:host-gateway'