glenux/docmachine-containers
glenux/docmachine-containers
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases Packages Wiki Activity

fix: broken entrypoint script & config name

Browse source
This commit is contained in:
Glenn Y. Rolland 2022-01-28 19:43:53 +01:00
parent 73e55d8e55
commit 12b548e906
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/entrypoint.sh
View file

@ -33,7 +33,7 @@ chown -R "$EXT_UID:$EXT_GID" /home/appuser
# Patch mkdocs configuration # Patch mkdocs configuration
if [ -f mkdocs-patch.yml ]; then if [ -f mkdocs-patch.yml ]; then
yq \ yq \
eval-all eval-all \
'. as $item ireduce ({}; . * $item)' \ '. as $item ireduce ({}; . * $item)' \
mkdocs-source.yml \ mkdocs-source.yml \
mkdocs-patch.yml \ mkdocs-patch.yml \

2
scripts/gx-teaching
View file

@ -82,7 +82,7 @@ if [ -f "$BASEDIR/mkdocs.yml" ]; then
fi fi
if [ -f "$BASEDIR/mkdocs-patch.yml" ]; then 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)" echo "Mkdocs: detected mkdocs-patch.yml file. Adding option to command line ($DOCKER_OPT_MKDOCS_CONFIG)"
else else
echo "Mkdocs: no mkdocs-patch.yml detected. Using default files" echo "Mkdocs: no mkdocs-patch.yml detected. Using default files"