Merge pull request #587 from open-contracting/redis-refactor

feat: migrate to rapidfort container

Author: RobHooper

pillar/cove.sls

@@ -2,7 +2,6 @@ x-volumes: &volumes
   - db
   - media
   - redis/data
-  - redis/tmp
 
 x-env: &env
   DJANGO_PROXY: True

pillar/digitalbuying.sls

@@ -21,7 +21,6 @@ docker_apps:
     volumes:
       - media
       - redis/data
-      - redis/tmp
     env:
       DJANGO_PROXY: True
       ALLOWED_HOSTS: digitalbuying.open-contracting.org

pillar/dreambi.sls

@@ -47,7 +47,6 @@ docker_apps:
     site: bi.dream.gov.ua
     volumes:
       - redis/data
-      - redis/tmp
     env:
       # Must end with a "/".
       QLIK_PROXY_SERVICE: https://ocp15.open-contracting.org:4243/qps/prod/

pillar/registry.sls

@@ -174,7 +174,6 @@ docker_apps:
       - media
       - tmp
       - redis/data
-      - redis/tmp
     env:
       DJANGO_PROXY: True
       ALLOWED_HOSTS: flatten.open-contracting.org

salt/docker_apps/files/conf/redis.conf

@@ -0,0 +1,6 @@
+bind 0.0.0.0 ::
+dir /data
+# https://redis.io/docs/latest/operate/oss_and_stack/management/persistence/#append-only-file
+appendonly yes
+# https://redis.io/docs/latest/operate/oss_and_stack/management/persistence/#how-i-can-switch-to-aof-if-im-currently-using-dumprdb-snapshots
+save ""

salt/docker_apps/files/cove.yaml

@@ -21,18 +21,18 @@ x-django: &django
 services:
 {%- if 'REDIS_URL' in entry.env %}
   redis:
-    image: bitnamilegacy/redis:6.2
+    image: redis:8.4
+    command: ["redis-server", "/redis.conf"]
+    user: "{{ pillar.docker.uid }}:{{ pillar.docker.uid }}"
     restart: always
-    environment:
-      ALLOW_EMPTY_PASSWORD: "yes"
     healthcheck:
       test: redis-cli -h 127.0.0.1 ping | grep -q PONG
       interval: 10s
       timeout: 5s
       retries: 5
     volumes:
-      - {{ directory }}/redis/data:/bitnami/redis/data
-      - {{ directory }}/redis/tmp:/opt/bitnami/redis/tmp
+      - {{ directory }}/redis/data:/data
+      - {{ directory }}/redis/redis.conf:/redis.conf
 {%- endif %}
   web:
     <<: *django

salt/docker_apps/files/digitalbuying.yaml

@@ -16,18 +16,18 @@ x-django: &django
 
 services:
   redis:
-    image: bitnamilegacy/redis:6.2
+    image: redis:8.4
+    command: ["redis-server", "/redis.conf"]
+    user: "{{ pillar.docker.uid }}:{{ pillar.docker.uid }}"
     restart: always
-    environment:
-      ALLOW_EMPTY_PASSWORD: "yes"
     healthcheck:
       test: redis-cli -h 127.0.0.1 ping | grep -q PONG
       interval: 10s
       timeout: 5s
       retries: 5
     volumes:
-      - {{ directory }}/redis/data:/bitnami/redis/data
-      - {{ directory }}/redis/tmp:/opt/bitnami/redis/tmp
+      - {{ directory }}/redis/data:/data
+      - {{ directory }}/redis/redis.conf:/redis.conf
   web:
     <<: *django
     ports:

salt/docker_apps/files/qlikauth.yaml

@@ -5,18 +5,18 @@ x-shared: &shared
 
 services:
   redis:
-    image: bitnamilegacy/redis:6.2
+    image: redis:8.4
+    command: ["redis-server", "/redis.conf"]
+    user: "{{ pillar.docker.uid }}:{{ pillar.docker.uid }}"
     restart: always
-    environment:
-      ALLOW_EMPTY_PASSWORD: "yes"
     healthcheck:
       test: redis-cli -h 127.0.0.1 ping | grep -q PONG
       interval: 10s
       timeout: 5s
       retries: 5
     volumes:
-      - {{ directory }}/redis/data:/bitnami/redis/data
-      - {{ directory }}/redis/tmp:/opt/bitnami/redis/tmp
+      - {{ directory }}/redis/data:/data
+      - {{ directory }}/redis/redis.conf:/redis.conf
   web:
     <<: *shared
     image: "ghcr.io/open-contracting/bi.dream.gov.ua-qlikauth:latest"

salt/docker_apps/files/spoonbill.yaml

@@ -20,18 +20,18 @@ x-django: &django
 
 services:
   redis:
-    image: bitnamilegacy/redis:6.2
+    image: redis:8.4
+    command: ["redis-server", "/redis.conf"]
+    user: "{{ pillar.docker.uid }}:{{ pillar.docker.uid }}"
     restart: always
-    environment:
-      ALLOW_EMPTY_PASSWORD: "yes"
     healthcheck:
       test: redis-cli -h 127.0.0.1 ping | grep -q PONG
       interval: 10s
       timeout: 5s
       retries: 5
     volumes:
-      - {{ entry.host_dir }}/redis/data:/bitnami/redis/data
-      - {{ entry.host_dir }}/redis/tmp:/opt/bitnami/redis/tmp
+      - {{ entry.host_dir }}/redis/data:/data
+      - {{ directory }}/redis/redis.conf:/redis.conf
   web:
     <<: *django
     ports:

salt/docker_apps/init.sls

@@ -41,16 +41,23 @@ include:
       - user: {{ pillar.docker.user }}_user_exists
 
 {% for volume in entry.volumes|default([]) %}
-# "NOTE: As this is a non-root container, the mounted files and directories must have the proper permissions for the UID 1001."
-# https://github.com/bitnami/containers/blob/main/bitnami/redis/README.md#persisting-your-database
-{% set volume_user_group = 1001 if volume.startswith('redis/') else pillar.docker.user %}
-
 {{ entry.host_dir|default(directory) }}/{{ volume }}:
   file.directory:
-    - user: {{ volume_user_group }}
-    - group: {{ volume_user_group }}
+    - user: {{ pillar.docker.user }}
+    - group: {{ pillar.docker.user }}
     - makedirs: True
     - require:
       - user: {{ pillar.docker.user }}_user_exists
 {% endfor %}
+
+{% if 'redis' in entry.volumes|join(' ') %}
+{{ directory }}/redis/redis.conf:
+  file.managed:
+    - source: salt://docker_apps/files/conf/redis.conf
+    - user: {{ pillar.docker.user }}
+    - group: {{ pillar.docker.user }}
+    - makedirs: True
+    - require:
+      - user: {{ pillar.docker.user }}_user_exists
+{% endif %}
 {% endfor %}