Skip to content

Commit

Permalink
Can't do yaml_read_files with rooted path
Browse files Browse the repository at this point in the history
  • Loading branch information
rfay committed Jul 30, 2024
1 parent 648f090 commit cbf3338
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ post_install_actions:
{{ end }}
{{ else if hasKey $supported_services $service_def.type }}
{{/* Other services */}}
relationships+=($(${DDEV_APPROOT/.ddev/platformsh/generate_{{ $service_def.type }}_relationship.sh '{{ $relationship_name }}' | ${BASE64_ENCODE}))
relationships+=($(${DDEV_APPROOT}/.ddev/platformsh/generate_{{ $service_def.type }}_relationship.sh '{{ $relationship_name }}' | ${BASE64_ENCODE}))
{{ $service_addon := get $supported_services $service_def.type }}
{{ if $service_addon }}
echo "Running 'ddev get {{ $service_addon }}'"
Expand Down Expand Up @@ -328,7 +328,7 @@ post_install_actions:
ENDOFHOOKS
yaml_read_files:
platformapp: ${DDEV_APPROOT}/.platform.app.yaml
services: ${DDEV_APPROOT}/.platform/services.yaml
routes: ${DDEV_APPROOT}/.platform/routes.yaml
platformapp: .platform.app.yaml
services: .platform/services.yaml
routes: .platform/routes.yaml

2 changes: 1 addition & 1 deletion tests/per_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ per_test_setup() {
# If the template happens to have a .ddev directory, remove as it can break things
rm -rf .ddev
# Start with bogus settings so we know we got the right stuff when testing
ddev config --project-name=${PROJNAME} --php-version=5.6 --database=mariadb:10.1 --docroot=x --create-docroot --project-type=php --web-environment-add=PLATFORMSH_CLI_TOKEN=notokenrightnow,PLATFORM_PROJECT=notyet,PLATFORM_ENVIRONMENT=notyet
ddev config --project-name=${PROJNAME} --php-version=5.6 --database=mariadb:10.1 --docroot=x --project-type=php --web-environment-add=PLATFORMSH_CLI_TOKEN=notokenrightnow,PLATFORM_PROJECT=notyet,PLATFORM_ENVIRONMENT=notyet
echo "# doing ddev get $source with template ${template} PROJNAME=${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
ddev get ${PROJECT_SOURCE}
echo "# doing ddev restart with template ${template} PROJNAME=${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
Expand Down

0 comments on commit cbf3338

Please sign in to comment.