Skip to content

Commit a01de14

Browse files
Stephan-Kokjohanib
authored andcommitted
engine - compatible with symfony 4 upgrade
1 parent b2a18b3 commit a01de14

5 files changed

Lines changed: 21 additions & 6 deletions

File tree

core/.env.ci.dist

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
APP_ENV=ci
2-
SYMFONY_ENV=ci
2+
APP_DEBUG=true
3+
APP_SECRET=secret

core/README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,18 @@ To mount the code in multiple containers:
8484
`start-dev-env.sh profile:../../OpenConext-profile userlifecycle:../../OpenConext-user-lifecycle`
8585
You can add as many services+local code paths that you need.
8686
The recommended way is to use absolute paths and the script requires the name of the service and local code path to be separated by a `:`, for each service.
87+
88+
# Tips
89+
90+
To start engine in local development environment use from this directory;
91+
92+
Ensure a file `.env` exists with:
93+
```shell
94+
APP_ENV=dev
95+
APP_DEBUG=true
96+
APP_SECRET=secret
97+
```
98+
```shell
99+
./start-dev-env.sh engine:../../OpenConext-engineblock/
100+
```
101+
To change the running env, just edit `APP_ENV=ci` for example and re-run `./start-dev-env.sh engine:../../OpenConext-engineblock/`. You do not have to recreate all services, only to reload engineblock.

core/docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ services:
107107
condition: service_healthy
108108
environment:
109109
- APP_ENV=${APP_ENV:-prod}
110-
- SYMFONY_ENV=${APP_ENV:-prod}
110+
- APP_DEBUG=${APP_ENV:-false}
111+
- APP_SECRET=${APP_SECRET:?APP_SECRET is not set}
111112

112113
profile:
113114
image: ghcr.io/openconext/openconext-profile/profile:prod

core/engine/appconf.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
1414
Header always set X-Content-Type-Options "nosniff"
1515

1616
SetEnv HTTPS on
17-
#SetEnv ENGINEBLOCK_ENV dev
18-
#SetEnv SYMFONY_ENV dev
1917

2018
RewriteEngine On
2119
# We support only GET/POST

core/engine/docker-compose.override.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ services:
1010
- ./engine/appconf.conf:/etc/apache2/sites-enabled/appconf.conf
1111
environment:
1212
- APP_ENV=${APP_ENV:-dev}
13-
- SYMFONY_ENV=${APP_ENV:-dev}
14-
- APP_DEBUG=1
13+
- APP_DEBUG=${APP_DEBUG:-true}
14+
- APP_SECRET=${APP_SECRET:-secret}
1515
healthcheck:
1616
test: ["CMD", "true"]
1717
interval: 10s

0 commit comments

Comments
 (0)