Skip to content

Commit

Permalink
Fix PID file error in Docker containers (#65)
Browse files Browse the repository at this point in the history
* Fix redis-sentinel entrypoint & /etc/redis permissions

Signed-off-by: Gazdag András <[email protected]>

* Fix PID error on startup

Signed-off-by: Gazdag András <[email protected]>

* Fix PID file error in redis image

Signed-off-by: Gazdag András <[email protected]>

* Update Operator and Image versions

Signed-off-by: Gazdag András <[email protected]>

---------

Signed-off-by: Gazdag András <[email protected]>
Co-authored-by: Gazdag András <[email protected]>
  • Loading branch information
gazdagandras and gazdagandras authored Dec 21, 2023
1 parent 4d01a33 commit 48a503f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.sentinel
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down

0 comments on commit 48a503f

Please sign in to comment.