Skip to content

Commit

Permalink
Merge pull request #13932 from found-it/redis-sentinel-6.2-compat-bit…
Browse files Browse the repository at this point in the history
…nami

Update redis-sentinel compat bitnami path
  • Loading branch information
ajayk authored Mar 1, 2024
2 parents 4460b56 + d14f7cd commit 120b2b7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions redis-sentinel-6.2-compat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package:
name: redis-sentinel-6.2-compat
version: 6.2.13
epoch: 0
epoch: 1
description: "Redis Sentinel provides high availability for Redis."
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -47,7 +47,7 @@ pipeline:
mkdir -p "${{targets.destdir}}"/opt/bitnami/redis-sentinel/tmp
mkdir -p "${{targets.destdir}}"/bitnami/redis-sentinel/conf
cd bitnami/redis-sentinel/6.2/debian-11
cd bitnami/redis-sentinel/6.2/debian-12
cp -R ./prebuildfs/opt/bitnami/* ${{targets.destdir}}/opt/bitnami/
cp -R ./rootfs/opt/bitnami/scripts ${{targets.destdir}}/opt/bitnami/
Expand Down
10 changes: 5 additions & 5 deletions redis-sentinel-6.2-compat/remove-user-check.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
diff --git a/bitnami/redis-sentinel/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel/setup.sh b/bitnami/redis-sentinel/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel/setup.sh
diff --git a/bitnami/redis-sentinel/6.2/debian-12/rootfs/opt/bitnami/scripts/redis-sentinel/setup.sh b/bitnami/redis-sentinel/6.2/debian-12/rootfs/opt/bitnami/scripts/redis-sentinel/setup.sh
index d870e24..711bc13 100755
--- a/bitnami/redis-sentinel/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel/setup.sh
+++ b/bitnami/redis-sentinel/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel/setup.sh
--- a/bitnami/redis-sentinel/6.2/debian-12/rootfs/opt/bitnami/scripts/redis-sentinel/setup.sh
+++ b/bitnami/redis-sentinel/6.2/debian-12/rootfs/opt/bitnami/scripts/redis-sentinel/setup.sh
@@ -16,9 +16,6 @@ set -o pipefail
. /opt/bitnami/scripts/libredissentinel.sh
. /opt/bitnami/scripts/libos.sh

-# Create daemon user if needed
-am_i_root && ensure_user_exists "$REDIS_SENTINEL_DAEMON_USER" --group "$REDIS_SENTINEL_DAEMON_GROUP"
-
# Ensure redis environment variables are valid
redis_validate

0 comments on commit 120b2b7

Please sign in to comment.