From 48a503fce2e3d86dd626cb2720ba62ecd234e11b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Gazdag?= Date: Thu, 21 Dec 2023 20:01:57 +0100 Subject: [PATCH] Fix PID file error in Docker containers (#65) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix redis-sentinel entrypoint & /etc/redis permissions Signed-off-by: Gazdag András * Fix PID error on startup Signed-off-by: Gazdag András * Fix PID file error in redis image Signed-off-by: Gazdag András * Update Operator and Image versions Signed-off-by: Gazdag András --------- Signed-off-by: Gazdag András Co-authored-by: Gazdag András --- Dockerfile | 3 ++- Dockerfile.sentinel | 3 ++- Makefile | 4 ++-- README.md | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7cd39e6..25b4162 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,7 +57,8 @@ RUN chown -R 1000:0 /etc/redis && \ chmod -R g+rw /data && \ mkdir /node-conf && \ chown -R 1000:0 /node-conf && \ - chmod -R g+rw /node-conf + chmod -R g+rw /node-conf && \ + chmod -R g+rw /var/run VOLUME ["/data"] VOLUME ["/node-conf"] diff --git a/Dockerfile.sentinel b/Dockerfile.sentinel index 6a5df47..4d580a1 100644 --- a/Dockerfile.sentinel +++ b/Dockerfile.sentinel @@ -46,7 +46,8 @@ RUN chown -R 1000:0 /etc/redis && \ chmod -R g+rw /etc/redis && \ mkdir /sentinel-data && \ chown -R 1000:0 /sentinel-data && \ - chmod -R g+rw /sentinel-data + chmod -R g+rw /sentinel-data && \ + chmod -R g+rw /var/run VOLUME ["/sentinel-data"] diff --git a/Makefile b/Makefile index 621ef50..209f633 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -REDIS_VERSION ?= v7.0.12 -SENTINEL_VERSION ?= v7.0.12 +REDIS_VERSION ?= v7.0.13 +SENTINEL_VERSION ?= v7.0.13 EXPORTER_VERSION ?= v1.48.0 IMG ?= quay.io/opstree/redis:$(REDIS_VERSION) diff --git a/README.md b/README.md index 6d2445f..e74d49d 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ The following table shows the compatibility between the Operator Version, Redis | Operator Version | Redis Image | Sentinel Image | Exporter Image | |------------------|-------------|----------------|----------------| +| v0.15.2 | v7.0.13 | v7.0.13 | v1.48.0 | | v0.15.1 | v7.0.12 | v7.0.12 | v1.48.0 | | v0.15.0 | v7.0.11 | v7.0.11 | v1.48.0 | | v0.14.0 | v7.0.7 | v7.0.7 | v1.48.0 |