fix: respect bundled apps and drop the dead marketplace API key - #542
Merged
Conversation
The install branch of 40-apps.sh only checked ${OWNCLOUD_VOLUME_APPS}/${VAL},
never /var/www/owncloud/apps/${VAL}, while the enable/disable branches in the
same file check both. Any app bundled in the release tarball was therefore
handed to `occ market:install` on every start. For an OCL app such as
admin_audit that lookup fails, `market:install` exits 1, and since the hook is
sourced by /usr/bin/owncloud under `set -eo pipefail` the container dies before
`exec "$@"` - with no error banner.
Check both directories, move the `market:upgrade --major` call inside the guard
(UpgradeApp fails on the same exception path), and report why a marketplace
install failed instead of dying silently.
Fixes #539
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
Marketplace API keys no longer exist, so OWNCLOUD_MARKETPLACE_KEY (and its OWNCLOUD_MARKETPLACE_APIKEY fallback) and the marketplace.key config value they write are dead configuration surface. marketplace.ca, appstoreenabled and appstoreurl stay: the store still serves community apps anonymously and those keys still allow disabling the appstore or pointing at a private one. config.php is regenerated on every start, so marketplace.key disappears from existing deployments on the next restart. Fixes #540 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
DeepDiver1975
force-pushed
the
fix/bundled-apps-marketplace-key-secrets
branch
from
August 18, 2026 14:41
0083f5e to
364896b
Compare
DeepDiver1975
changed the title
phil-davis
approved these changes
Aug 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two defects that surfaced together in a
10.16.4startup log that ended atadmin_audit: App (admin_audit) is not known at the marketplace.with no errorbanner and no Apache. Scoped to
v22.04andv24.04;v20.04is dormant anduntouched.
The secret-leak fix that was originally part of this PR now lives in #543 — it is
reviewable and mergeable on its own.
1. Apps that ship in the image are no longer sent to the marketplace (#539)
40-apps.shgated the install branch on${OWNCLOUD_VOLUME_APPS}/${VAL}only,never
/var/www/owncloud/apps/${VAL}— the enable/disable branches in the samefile already check both. A bundled app was therefore invisible to the check and
handed to
occ market:installon every start. For an OCL app such asadmin_auditthat lookup fails,market:installexits 1, and because the hookis sourced by
/usr/bin/owncloudunderset -eo pipefailthe shell diesbefore
exec "$@"— the container never starts and prints no error.Not a
10.16.4regression: reproduced byte-identically on10.16.3, whose hookscripts, app set and
apps.jsonpayload are the same.The guard now covers both directories,
market:upgrade --majormoved inside it(
UpgradeAppfails on the same exception path), and a genuine marketplacefailure now says why. The URL branch is unchanged — an explicit URL is an
unambiguous request to install from that tarball.
2.
OWNCLOUD_MARKETPLACE_KEYremoved (#540)Marketplace API keys no longer exist.
marketplace.ca,appstoreenabledandappstoreurlstay.config.phpis regenerated on every start, somarketplace.keydisappears from existing deployments on the next restart — nomigration needed.
Verification
Ran against
owncloud/server:10.16.4with this overlay layered in (sqlite, noDB container):
OWNCLOUD_APPS_INSTALL=admin_auditadmin_auditEnabled at/var/www/owncloud/apps/admin_audit(was exit 1)OWNCLOUD_APPS_INSTALL_MAJOR=trueOWNCLOUD_APPS_INSTALL=this_app_does_not_existERROR:guidanceOWNCLOUD_APPS_INSTALL=musicOWNCLOUD_MARKETPLACE_KEY=SomeApiKeyconfig.php;marketplace.castill writtenshellcheckclean on every touched script,php -lclean on both templates.Follow-up
owncloud-docker/serverneeds itsFROM owncloud/base:22.04@sha256:...digestbumped in
v22.04/Dockerfile.multiarchonce this is published (Renovatenormally does this).
Workaround for affected users, no rebuild needed: move bundled apps out of
OWNCLOUD_APPS_INSTALLintoOWNCLOUD_APPS_ENABLE.🤖 Generated with Claude Code