Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **21.07.23:** - Update built-in plugins on container update.
* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
* **13.04.23:** - Move ssl.conf include to default.conf.
* **28.12.22:** - Rebase to Alpine 3.17, migrate to s6v3.
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ app_setup_block: |
Upon first install go to `http://$IP:$PORT/install.php` once you have completed the setup, restart the container, login as admin and set "Use nice URLs" in the `admin/Configuration Settings` panel to `.htaccess` and tick `Use slash as namespace separator in URLs` to enable [nice URLs](https://www.dokuwiki.org/rewrite) you will find the webui at `http://$IP:$PORT/`, for more info see [{{ project_name|capitalize }}]({{ project_url }})
# changelog
changelogs:
- { date: "21.07.23:", desc: "Update built-in plugins on container update." }
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
- { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
- { date: "28.12.22:", desc: "Rebase to Alpine 3.17, migrate to s6v3." }
Expand Down
12 changes: 9 additions & 3 deletions root/etc/s6-overlay/s6-rc.d/init-dokuwiki-config/run
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,18 @@ fi

## Move user folders to persistent storage
for i in "${USER_DIRECTORY[@]}"; do
if [[ ! -d /config/dokuwiki/${i} ]] && [[ -d /app/www/public/"${i}" ]]; then
if [[ ! -d /config/dokuwiki/"${i}" ]] && [[ -d /app/www/public/"${i}" ]]; then
mv /app/www/public/"${i}" /config/dokuwiki/"${i}"/
fi
done

# Update built-in plugins
for i in /app/www/public/lib/plugins/*/; do
if [[ -d "/config/dokuwiki/lib/plugins/$(basename "${i}")" ]] && [[ -d "/app/www/public/lib/plugins/$(basename "${i}")" ]]; then
cp -R /app/www/public/lib/plugins/"$(basename "${i}")"/* /config/dokuwiki/lib/plugins/"$(basename "${i}")"
fi
done

## Remove user folders
for i in "${USER_DIRECTORY[@]}"; do
if [[ -d /app/www/public/"${i}" ]]; then
Expand Down Expand Up @@ -76,12 +83,11 @@ fi
## Remove install.php once setup & enable pretty urls to work after setting .htaccess method in admin panel.
if [[ -f /config/dokuwiki/conf/local.php ]]; then
if rm -rf /app/www/public/install.php; then
echo "Existing install found install.php not available"
echo "Existing install found, deleting install.php."
fi

# when default savedir stil active: change it to the path IN the container
if ! grep -q "^\$conf\[\'savedir\'\]\s*\=" /config/dokuwiki/conf/local.php; then
echo "Set 'savedir' to absolute path in the container"
echo "\$conf['savedir'] = '/app/www/public/data';" >> /config/dokuwiki/conf/local.php
fi

Expand Down