diff options
| -rw-r--r-- | docker/redis/redis-base/Dockerfile.j2 | 13 | ||||
| -rw-r--r-- | docker/redis/redis-base/extend_start.sh | 9 | ||||
| -rw-r--r-- | docker/redis/redis-sentinel/Dockerfile.j2 | 18 | ||||
| -rw-r--r-- | docker/redis/redis/Dockerfile.j2 (renamed from docker/redis/Dockerfile.j2) | 4 | ||||
| -rw-r--r-- | releasenotes/notes/redis-sentinel-container-defa09d0ac420f64.yaml | 3 |
5 files changed, 44 insertions, 3 deletions
diff --git a/docker/redis/redis-base/Dockerfile.j2 b/docker/redis/redis-base/Dockerfile.j2 new file mode 100644 index 000000000..f0fc17db8 --- /dev/null +++ b/docker/redis/redis-base/Dockerfile.j2 @@ -0,0 +1,13 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block redis_base_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.configure_user(name='redis', homedir='/run/redis') }} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start + +{% block redis_base_footer %}{% endblock %} diff --git a/docker/redis/redis-base/extend_start.sh b/docker/redis/redis-base/extend_start.sh new file mode 100644 index 000000000..f5f12ac70 --- /dev/null +++ b/docker/redis/redis-base/extend_start.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/redis" ]]; then + mkdir -p /var/log/kolla/redis +fi + +if [[ $(stat -c %a /var/log/kolla/redis) != "755" ]]; then + chmod 755 /var/log/kolla/redis +fi diff --git a/docker/redis/redis-sentinel/Dockerfile.j2 b/docker/redis/redis-sentinel/Dockerfile.j2 new file mode 100644 index 000000000..e6ce0b600 --- /dev/null +++ b/docker/redis/redis-sentinel/Dockerfile.j2 @@ -0,0 +1,18 @@ +FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block redis_sentinel_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set redis_sentinel_packages = ['redis'] %} +{% elif base_distro in ['debian', 'ubuntu'] %} + {% set redis_sentinel_packages = ['redis-sentinel'] %} +{% endif %} +{{ macros.install_packages(redis_sentinel_packages | customizable("packages")) }} + +{% block redis_sentinel_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER redis diff --git a/docker/redis/Dockerfile.j2 b/docker/redis/redis/Dockerfile.j2 index bfedb67c3..0f81725f2 100644 --- a/docker/redis/Dockerfile.j2 +++ b/docker/redis/redis/Dockerfile.j2 @@ -1,12 +1,10 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block redis_header %}{% endblock %} {% import "macros.j2" as macros with context %} -{{ macros.configure_user(name='redis', homedir='/run/redis') }} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set redis_packages = ['redis'] %} {% elif base_distro in ['debian', 'ubuntu'] %} diff --git a/releasenotes/notes/redis-sentinel-container-defa09d0ac420f64.yaml b/releasenotes/notes/redis-sentinel-container-defa09d0ac420f64.yaml new file mode 100644 index 000000000..961db511a --- /dev/null +++ b/releasenotes/notes/redis-sentinel-container-defa09d0ac420f64.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add a redis-sentinel image to deploy highly available redis clusters |