Skip to content
Snippets Groups Projects
Commit aab252a3 authored by Reiter, Christoph's avatar Reiter, Christoph :snake:
Browse files

Remove unused API_DEPLOYMENT_ENV

While it might be useful for later stages in development, let's keep this simple
parent 13799fa2
Branches
Tags
No related merge requests found
Pipeline #52739 passed
...@@ -35,7 +35,6 @@ host('development') ...@@ -35,7 +35,6 @@ host('development')
->set('shared_dirs', ['var/log', 'var/sessions']) ->set('shared_dirs', ['var/log', 'var/sessions'])
->set('APP_ENV', 'prod') ->set('APP_ENV', 'prod')
->set('APP_DEBUG', '0') ->set('APP_DEBUG', '0')
->set('API_DEPLOYMENT_ENV', 'development')
->set('KEYCLOAK_SERVER_URL', 'https://auth-dev.tugraz.at/auth') ->set('KEYCLOAK_SERVER_URL', 'https://auth-dev.tugraz.at/auth')
->set('KEYCLOAK_CLIENT_ID', 'auth-dev-mw-dev') ->set('KEYCLOAK_CLIENT_ID', 'auth-dev-mw-dev')
->set('KEYCLOAK_FRONTEND_CLIENT_ID', 'auth-dev-mw-frontend') ->set('KEYCLOAK_FRONTEND_CLIENT_ID', 'auth-dev-mw-frontend')
...@@ -52,7 +51,6 @@ task('build-custom', function () { ...@@ -52,7 +51,6 @@ task('build-custom', function () {
'KEYCLOAK_CLIENT_SECRET' => getenv('KEYCLOAK_CLIENT_SECRET'), 'KEYCLOAK_CLIENT_SECRET' => getenv('KEYCLOAK_CLIENT_SECRET'),
'APP_ENV' => $APP_ENV, 'APP_ENV' => $APP_ENV,
'APP_DEBUG' => get('APP_DEBUG'), 'APP_DEBUG' => get('APP_DEBUG'),
'API_DEPLOYMENT_ENV' => get('API_DEPLOYMENT_ENV'),
'KEYCLOAK_SERVER_URL' => get('KEYCLOAK_SERVER_URL'), 'KEYCLOAK_SERVER_URL' => get('KEYCLOAK_SERVER_URL'),
'KEYCLOAK_CLIENT_ID' => get('KEYCLOAK_CLIENT_ID'), 'KEYCLOAK_CLIENT_ID' => get('KEYCLOAK_CLIENT_ID'),
'KEYCLOAK_FRONTEND_CLIENT_ID' => get('KEYCLOAK_FRONTEND_CLIENT_ID'), 'KEYCLOAK_FRONTEND_CLIENT_ID' => get('KEYCLOAK_FRONTEND_CLIENT_ID'),
......
...@@ -15,11 +15,7 @@ class Kernel extends BaseKernel ...@@ -15,11 +15,7 @@ class Kernel extends BaseKernel
protected function configureContainer(ContainerConfigurator $container): void protected function configureContainer(ContainerConfigurator $container): void
{ {
// Ignore all errors in case we are not local/development. We disable some $container->import('../config/{packages}/*.yaml');
// bundles in demo/prod which leads to unused config, which symfony fails over.
$ignoreErrors = !in_array($_ENV['API_DEPLOYMENT_ENV'], ['local', 'development'], true);
$container->import('../config/{packages}/*.yaml', null, $ignoreErrors);
$container->import('../config/{packages}/'.$this->environment.'/*.yaml'); $container->import('../config/{packages}/'.$this->environment.'/*.yaml');
if (is_file(\dirname(__DIR__).'/config/services.yaml')) { if (is_file(\dirname(__DIR__).'/config/services.yaml')) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment