* fix(hooks): incorrect skipped output in mixed exec/non-exec batches
The `found` variable is incorrectly decremented for non-executable scripts, which leads to misleading output when a hook folder contains an executable + a non-executable script (output will indicate the folder was fully scripted).
Signed-off-by: Josh <josh.t.richards@gmail.com>
* chore(hooks): make skipped/completed logic more intuitive
Signed-off-by: Josh <josh.t.richards@gmail.com>
---------
Signed-off-by: Josh <josh.t.richards@gmail.com>
Extract the disabled-app reporting logic into a helper and compare normalized enabled app names instead of parsing diff output from full `occ app:list` snapshots.
This fixes false positives where apps upgraded during `occ upgrade` were reported as disabled because their version line changed, and avoids reliance on diff output format differences on Alpine/BusyBox.
Fixes#1911
Signed-off-by: Josh <josh.t.richards@gmail.com>
Limit return_code to the per-script failure path instead of keeping it as loop state.
This does not change current behavior, but makes the code easier to reason about and avoids future stale-state bugs if the loop logic is refactored.
Signed-off-by: Josh <josh.t.richards@gmail.com>
* fix(hooks): Consistent logging + skip when empty too
- Use "Searching for scripts [...] located in [...]" consistently (i.e. for each hook_folder_path instead of only for some / under some conditions)
- Skip early if a given hook folder is empty too (not just nonexistent)
- Add feature name (hooks) to all messaging for clarity
Signed-off-by: Josh <josh.t.richards@gmail.com>
* fix(hooks): Clear state delineation / consistent output
Signed-off-by: Josh <josh.t.richards@gmail.com>
---------
Signed-off-by: Josh <josh.t.richards@gmail.com>
* Use `find` to located `*.sh`
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
* added msg if hook folder does not exist
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
* Updated info message
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: Dennis Værum <6872940+dvaerum@users.noreply.github.com>
* Update docker-entrypoint.sh
Small adjustments
Signed-off-by: Dennis Værum <6872940+dvaerum@users.noreply.github.com>
---------
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
Signed-off-by: Dennis Værum <6872940+dvaerum@users.noreply.github.com>
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
* Block upgrade if it is not supported
Closes#1809. This prevents the install from getting in a state where none
of the Docker images will accept running given the contents of the volumes.
Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
* Update docker-entrypoint.sh
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
* Update docker-entrypoint.sh
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
* Remove extra function
Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
* Update docker-entrypoint.sh
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
---------
Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
* Added entrypoint hooks for your own custom scripts
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
* Small changes:
- Only execute shell-scripts (mening files ending with .sh)
- Sort the files before executing them, had forgotten 😅
- Added a message when a hook script finish
- Added prefix arror to message to show the are related
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
* Show in the search msg that it only searches for '*.sh' files
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
* Fixed spelling mistake
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: Dennis Værum <6872940+dvaerum@users.noreply.github.com>
* Updated the `README.md` file
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
* change from using find to using a for-loop to located the `.sh` files
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
* Fix bug - that would make docker-entrypoint.sh failed, hook folders was empty
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
---------
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
Signed-off-by: Dennis Værum <6872940+dvaerum@users.noreply.github.com>
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
.In php:8.0-fpm-bullseye /bin/sh is dash, which does not support "${X:0:1}"
(substring expansion).
This reverts commit 0536522175.
Signed-off-by: Doncho N. Gunchev <dgunchev@gmail.com>
* Match cmd provided by Dockerfile again with entrypoint.sh
Signed-off-by: stackcoder <stackcoder@gmail.com>
* Fixup README.md
Signed-off-by: stackcoder <stackcoder@gmail.com>
* Disable rewrite ip for apache image
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Run update.sh
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Fix Redis Unix socket support
Rebase and rewrite the @epma01 pull request, based on last Nextcloud Docker changes
See: https://github.com/nextcloud/docker/pull/735
Signed-off-by: Tortue Torche <tortuetorche@users.noreply.github.com>
* Fix CI tests with update.sh script
Signed-off-by: Tortue Torche <tortuetorche@users.noreply.github.com>
Josh
Jean-Kevin KPADEY
Florian Latifi
Aakash parmar
J0WI
Simon L
Yevhen Kolomeiko
Dennis Værum
Antonin Delpeuch
Remi Rampin
MAbeeTT (Matías Pecchia)
John Molakvoæ
John Molakvoæ
Doncho N. Gunchev
Michael Griego
KnallbertLp
stackcoder
kesselb
Boris Gorbylev
Tortue Torche
algakzru
Tilo Spannagel
Richard Steinmetz