Skip to content

Ensure container starts if it is mounted with an empty /modules directory. #30699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 4, 2025
Merged

Ensure container starts if it is mounted with an empty /modules directory. #30699

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54b775a
Set nullglob
Half-Shot Sep 4, 2025
7aacd76
Replace with a if statement (because we're using sh)
Half-Shot Sep 4, 2025
c82282b
combine if
Half-Shot Sep 4, 2025
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
34 changes: 18 additions & 16 deletions docker/docker-entrypoint.d/18-load-element-modules.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,23 @@ entrypoint_log() {
mkdir -p /tmp/element-web-config
cp /app/config*.json /tmp/element-web-config/

# If there are modules to be loaded
# If the module directory exists
if [ -d "/modules" ]; then
cd /modules

for MODULE in *
do
# If the module has a package.json, use its main field as the entrypoint
ENTRYPOINT="index.js"
if [ -f "/modules/$MODULE/package.json" ]; then
ENTRYPOINT=$(jq -r '.main' "/modules/$MODULE/package.json")
fi

entrypoint_log "Loading module $MODULE with entrypoint $ENTRYPOINT"

# Append the module to the config
jq ".modules += [\"/modules/$MODULE/$ENTRYPOINT\"]" /tmp/element-web-config/config.json | sponge /tmp/element-web-config/config.json
done
# ...and the module directory has modules in it
if [ "$( ls -A '/modules' )" ]; then
Copy link
Member

@t3chguy t3chguy Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we not combine these =(?

cd /modules
for MODULE in *
do
# If the module has a package.json, use its main field as the entrypoint
ENTRYPOINT="index.js"
if [ -f "/modules/$MODULE/package.json" ]; then
ENTRYPOINT=$(jq -r '.main' "/modules/$MODULE/package.json")
fi

entrypoint_log "Loading module $MODULE with entrypoint $ENTRYPOINT"

# Append the module to the config
jq ".modules += [\"/modules/$MODULE/$ENTRYPOINT\"]" /tmp/element-web-config/config.json | sponge /tmp/element-web-config/config.json
done
fi
fi
Loading