There should be a different entrypoint.sh script for each setup (apache and fpm)

I've been using the nextcloud docker images for a while now without any issue until recently. Not that the issue was introduced by a change here but because of my usage of the image.

I want to extend the image in order to add functionnality like the live update script for the fulltextsearch application.

To do so, I used the nextcloud:apache as base and added scripts and supervisor and ended the Dockerfile with a new e.g.

CMD ["supervisord", "-c", "supervisor.conf"]

It was "working" but broke some parts of Nextcloud because the entrypoint.sh script ran partially. The reason is because that script has strong expectations on the CMD of the image.

E.g. this expects the CMD to contain apache:

As I understand, this was probably made to simplify the management of the 3 different images that are handled by this repo but it makes extending the images more difficult.

Writing this ticket, I came up with the idea that I could probably wrap my supervisor command in a script named apache-whatever but that would not a "great" experience.

What do you think ?

Read entrypoint.sh and the Dockerfile definitions first, focusing on how the current script identifies the Apache and FPM setups from CMD. Compare the setup-specific startup paths and determine how separate entrypoint scripts would preserve the existing behavior while allowing an extended image to use a different command; done means both setups work without relying on a command containing apache or fpm.