Merge pull request #408 from continuouspipe/feature/symfony-endpoint-fix

andytson-inviqa · web-flow · commit dbca95848290 · 2017-09-12T10:31:35.000+01:00
Resolve directories earlier so Symfony endpoint change works
diff --git a/php/shared/usr/local/share/env/35-stack b/php/shared/usr/local/share/env/35-stack
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+export WORK_DIRECTORY=${WORK_DIRECTORY:-/app}
diff --git a/php/shared/usr/local/share/env/40-stack b/php/shared/usr/local/share/env/40-stack
@@ -39,8 +39,7 @@ export XDEBUG_REMOTE_ENABLED
 export XDEBUG_REMOTE_HOST=${XDEBUG_REMOTE_HOST:-sshforward}
 export XDEBUG_REMOTE_PORT=${XDEBUG_REMOTE_PORT:-9000}
 
-export WORK_DIRECTORY=${WORK_DIRECTORY:-/app}
-
+export WEB_DIRECTORY=${WEB_DIRECTORY:-web}
 export WEB_HOST=${WEB_HOST:-localhost}
 export WEB_HTTP_PORT=${WEB_HTTP_PORT:-80}
 WEB_HTTPS="$(convert_to_boolean_string "${WEB_HTTPS:-true}")"
diff --git a/php/shared/usr/local/share/env/55-stack b/php/shared/usr/local/share/env/55-stack
@@ -1,5 +1,4 @@
 #!/bin/bash
-export WEB_DIRECTORY=${WEB_DIRECTORY:-web}
 
 # Relative WEB_DIRECTORY converted to absolute path
 if ! [[ "$WEB_DIRECTORY" =~ ^/ ]]; then
diff --git a/symfony/usr/local/share/env/37-framework b/symfony/usr/local/share/env/37-framework

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	`+`
	`3`	`+export WORK_DIRECTORY=${WORK_DIRECTORY:-/app}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#!/bin/bash`
`2`		`-export WEB_DIRECTORY=${WEB_DIRECTORY:-web}`
`3`	`2`
`4`	`3`	`# Relative WEB_DIRECTORY converted to absolute path`
`5`	`4`	`if ! [[ "$WEB_DIRECTORY" =~ ^/ ]]; then`