Skip to content
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.

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

Dynamically load Element Web modules in Docker entrypoint #29346

Merged
merged 4 commits into from
Feb 24, 2025

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Feb 24, 2025

No description provided.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy added this pull request to the merge queue Feb 24, 2025
Merged via the queue into develop with commit 8ef8434 Feb 24, 2025
45 checks passed
@t3chguy t3chguy deleted the t3chguy/docker-load-modules branch February 24, 2025 17:37
@RiotRobot
Copy link
Contributor

The backport to staging failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-staging staging
# Navigate to the new working tree
cd .worktrees/backport-staging
# Create a new branch
git switch --create backport-29346-to-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8ef84349b5b74d4c2b9edceee376e6a1df56ec92
# Push it to GitHub
git push --set-upstream origin backport-29346-to-staging
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-staging

Then, create a pull request where the base branch is staging and the compare/head branch is backport-29346-to-staging.

t3chguy added a commit that referenced this pull request Feb 25, 2025
* Dynamically load Element Web modules in Docker entrypoint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Drop environment for PR runs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 8ef8434)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
github-merge-queue bot pushed a commit that referenced this pull request Feb 25, 2025
…29358)

* Dynamically load Element Web modules in Docker entrypoint



* Iterate



* Drop environment for PR runs



* Iterate



---------



(cherry picked from commit 8ef8434)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@itay-grudev
Copy link
Contributor

@t3chguy Could you please take a look at #29371?

@itay-grudev
Copy link
Contributor

PR: #29372

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport staging Label to automatically backport PR to staging branch T-Enhancement X-Release-Blocker
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants