diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/redis/redis-base/Dockerfile.j2 | 17 | ||||
| -rw-r--r-- | docker/redis/redis-base/extend_start.sh | 9 | ||||
| -rw-r--r-- | docker/redis/redis-sentinel/Dockerfile.j2 | 25 | ||||
| -rw-r--r-- | docker/redis/redis-sentinel/extend_start.sh | 32 | ||||
| -rw-r--r-- | docker/redis/redis/Dockerfile.j2 | 22 |
5 files changed, 0 insertions, 105 deletions
diff --git a/docker/redis/redis-base/Dockerfile.j2 b/docker/redis/redis-base/Dockerfile.j2 deleted file mode 100644 index 89dccd258..000000000 --- a/docker/redis/redis-base/Dockerfile.j2 +++ /dev/null @@ -1,17 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% 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 644 /usr/local/bin/kolla_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block redis_base_footer %}{% endblock %} diff --git a/docker/redis/redis-base/extend_start.sh b/docker/redis/redis-base/extend_start.sh deleted file mode 100644 index f5f12ac70..000000000 --- a/docker/redis/redis-base/extend_start.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 deleted file mode 100644 index 83fc60df0..000000000 --- a/docker/redis/redis-sentinel/Dockerfile.j2 +++ /dev/null @@ -1,25 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block redis_sentinel_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - {% set redis_sentinel_packages = ['redis'] %} -{% elif base_package_type == 'deb' %} - {% set redis_sentinel_packages = ['redis-sentinel'] %} -{% endif %} -{{ macros.install_packages(redis_sentinel_packages | customizable("packages")) }} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 644 /usr/local/bin/kolla_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block redis_sentinel_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER redis diff --git a/docker/redis/redis-sentinel/extend_start.sh b/docker/redis/redis-sentinel/extend_start.sh deleted file mode 100644 index 9044f3990..000000000 --- a/docker/redis/redis-sentinel/extend_start.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/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 - -# The CONFIG REWRITE command rewrites the redis.conf -# file the server was started with, applying the minimal -# changes needed to make it reflect the configuration -# currently used by the server, which may be different -# compared to the original one because of the use of -# the CONFIG SET command. -# -# https://redis.io/commands/config-rewrite/ -# -# Because of above behaviour it's needed to -# hack kolla's CMD. -# -# Without this hack -# /usr/local/bin/kolla_set_configs --check -# is always reporting changed. -# -# Therefore redis-sentinel is always restarted -# even if configuration is not changed from -# kolla-ansible side. -if [ ! -z "${REDIS_CONF}" ] && [ ! -z ${REDIS_GEN_CONF} ]; then - cp ${REDIS_CONF} ${REDIS_GEN_CONF} -fi diff --git a/docker/redis/redis/Dockerfile.j2 b/docker/redis/redis/Dockerfile.j2 deleted file mode 100644 index 7e5ce923b..000000000 --- a/docker/redis/redis/Dockerfile.j2 +++ /dev/null @@ -1,22 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block redis_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - {% set redis_packages = ['redis'] %} -{% elif base_package_type == 'deb' %} - {% set redis_packages = ['redis-server'] %} -{% endif %} -{{ macros.install_packages(redis_packages | customizable("packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block redis_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER redis |