Skip to content

Fix: bundle Redis in CE Docker image and fix oracledb plugin lockfile #15900

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
gsmithun4 merged 9 commits into from
Apr 13, 2026
Merged

Fix: bundle Redis in CE Docker image and fix oracledb plugin lockfile #15900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1cf5ae8
Fix: Enhance Redis connection handling in CustomDomainCacheService
adishM98 Apr 13, 2026
c809aec
Update package-lock.json to remove dev dependencies and add unzipper …
adishM98 Apr 13, 2026
3e9dded
Fix: Update Redis connection handling to conditionally register BullM…
adishM98 Apr 13, 2026
74cd5bf
Fix: Enhance Redis setup in Docker configuration and entrypoint script
adishM98 Apr 13, 2026
ee5c21c
Fix: Remove conditional Redis connection based on ENABLE_CUSTOM_DOMAI…
adishM98 Apr 13, 2026
f42e811
Fix: Use optional chaining for Redis disconnection in onModuleDestroy
adishM98 Apr 13, 2026
6d07b3b
Fix: Refactor Redis configuration and setup in Dockerfile for improve…
adishM98 Apr 13, 2026
45d65fb
Fix: Update Redis configuration paths to use /app directory for impro…
adishM98 Apr 13, 2026
b718e0c
Fix: Bump version to 3.20.144-lts across all components
gsmithun4 Apr 13, 2026
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
2 changes: 1 addition & 1 deletion .version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.20.143-lts
3.20.144-lts
6 changes: 6 additions & 0 deletions docker/ce-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/bash
set -e

# Start Redis if not already running (bundled sidecar for single-instance CE)
if ! pgrep -x redis-server > /dev/null 2>&1; then
redis-server /app/redis.conf
echo "Redis started"
fi

if [ -f "./.env" ]; then
export $(grep -v '^#' ./.env | xargs -d '\n') || true
fi
Expand Down
13 changes: 10 additions & 3 deletions docker/ce-production.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ENV PATH=/usr/local/lib/nodejs/bin:$PATH
ENV NODE_ENV=production
ENV NODE_OPTIONS="--max-old-space-size=4096"
RUN apt-get update && \
apt-get install -y postgresql-client freetds-dev libaio1 wget && \
apt-get install -y postgresql-client freetds-dev libaio1 wget redis-server supervisor && \
apt-get -o Dpkg::Options::="--force-confold" upgrade -q -y --force-yes && \
apt-get -y autoremove && \
apt-get -y autoclean
Expand Down Expand Up @@ -96,12 +96,19 @@ COPY --from=builder /app/server/dist ./app/server/dist

COPY ./docker/ce-entrypoint.sh ./app/server/entrypoint.sh

# Define non-sudo user
# Define non-sudo user and set up Redis dirs in one layer (appuser must exist before chown)
RUN useradd --create-home --home-dir /home/appuser appuser \
&& chown -R appuser:0 /app \
&& chown -R appuser:0 /home/appuser \
&& chmod u+x /app \
&& chmod -R g=u /app
&& chmod -R g=u /app \
&& mkdir -p /var/lib/redis /var/log/redis \
&& chown -R appuser:0 /var/lib/redis /var/log/redis \
&& chmod -R g=u /var/lib/redis /var/log/redis
# Configure Redis — bind to localhost only, daemonized, no persistence needed for CE single-instance
# Written to /app (appuser-owned) to avoid /etc/redis permission issues
RUN printf 'bind 127.0.0.1\nport 6379\nprotected-mode yes\ndaemonize yes\nlogfile /var/log/redis/redis.log\ndir /var/lib/redis\n' \
> /app/redis.conf

# Set npm cache directory
ENV npm_config_cache /home/appuser/.npm
Expand Down
2 changes: 1 addition & 1 deletion frontend/.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.20.143-lts
3.20.144-lts
67 changes: 60 additions & 7 deletions plugins/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.20.143-lts
3.20.144-lts
Loading