diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 3726fec..09f43ee 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -33,7 +33,7 @@ chown -R "$EXT_UID:$EXT_GID" /home/appuser # Patch mkdocs configuration if [ -f mkdocs-patch.yml ]; then yq \ - eval-all + eval-all \ '. as $item ireduce ({}; . * $item)' \ mkdocs-source.yml \ mkdocs-patch.yml \ diff --git a/scripts/gx-teaching b/scripts/gx-teaching index 101b337..8f7a296 100755 --- a/scripts/gx-teaching +++ b/scripts/gx-teaching @@ -82,7 +82,7 @@ if [ -f "$BASEDIR/mkdocs.yml" ]; then fi if [ -f "$BASEDIR/mkdocs-patch.yml" ]; then - DOCKER_OPT_MKDOCS_CONFIG="-v $BASEDIR/mkdocs.yml:/app/mkdocs-patch.yml" + DOCKER_OPT_MKDOCS_CONFIG="-v $BASEDIR/mkdocs-patch.yml:/app/mkdocs-patch.yml" echo "Mkdocs: detected mkdocs-patch.yml file. Adding option to command line ($DOCKER_OPT_MKDOCS_CONFIG)" else echo "Mkdocs: no mkdocs-patch.yml detected. Using default files"