Make the nginx and envoy examples compatible with RedisInsight v2

Author: GnaneshKunal

envoy/docker-compose.yml

@@ -6,7 +6,7 @@ services:
       - redis-network
 
   redisinsight:
-    image: redislabs/redisinsight:latest
+    image: redis/redisinsight
     networks:
       - redis-network
     depends_on:
@@ -27,7 +27,7 @@ services:
   redisinsight-redis-setup:
     image: alpine
     environment:
-      - RIPORT=${RIPORT:-8001}
+      - RIPORT=${RIPORT:-5540}
     command:
       - sh
       - -c

envoy/envoy.yaml

@@ -42,7 +42,7 @@ static_resources:
             address:
               socket_address:
                 address: redisinsight
-                port_value: 8001
+                port_value: 5540
 admin:
   address:
     socket_address:

nginx-basicauth/docker-compose.yml

@@ -6,9 +6,9 @@ services:
       - redis-network
 
   redisinsight:
-    image: redislabs/redisinsight
+    image: redis/redisinsight
     environment:
-      - RIPORT=${RIPORT:-8001}
+      - RIPORT=${RIPORT:-5540}
       - RITRUSTEDORIGINS=http://localhost:9000
     depends_on:
       - redis-stack
@@ -23,38 +23,38 @@ services:
       - "${NGINX_PORT:-9000}:${NGINX_PORT:-9000}"
     environment:
       - FORWARD_HOST=redisinsight
-      - FORWARD_PORT=${RIPORT:-8001}
+      - FORWARD_PORT=${RIPORT:-5540}
       - NGINX_PORT=${NGINX_PORT:-9000}
       - BASIC_USERNAME=${BASIC_USERNAME:-redis}
       - BASIC_PASSWORD=${BASIC_PASSWORD:-password}
     command:
       - bash
       - -c
       - |
-        printf "$$BASIC_USERNAME:$$(openssl passwd -crypt $$BASIC_PASSWORD)\n" >> /etc/nginx/.htpasswd
+        printf "$$BASIC_USERNAME:$$(openssl passwd -1 $$BASIC_PASSWORD)\n" >> /etc/nginx/.htpasswd
         /docker-entrypoint.sh nginx -g "daemon off;"
     depends_on:
       - redisinsight
     networks:
       - redis-network
 
-  redisinsight-redis-setup:
-    image: alpine
-    environment:
-      - RIPORT=${RIPORT:-8001}
-    command:
-      - sh
-      - -c
-      - |
-        apk add curl
-        echo "Adding redis-stack...."
-        wget -qO- https://raw.githubusercontent.com/eficode/wait-for/v2.2.3/wait-for | sh -s -- redisinsight:$$RIPORT -- echo Redisinsight is up
-        curl -s -X "POST" "http://redisinsight:$$RIPORT/api/instance/"   -H "Content-Type: application/json; charset=utf-8" -d '{"host": "redis-stack","name": "redis-stack","connectionType": "STANDALONE","port": 6379}'
-    networks:
-      - redis-network
-    depends_on:
-      - redisinsight
-      - redis-stack
+  # redisinsight-redis-setup:
+  #   image: alpine
+  #   environment:
+  #     - RIPORT=${RIPORT:-8001}
+  #   command:
+  #     - sh
+  #     - -c
+  #     - |
+  #       apk add curl
+  #       echo "Adding redis-stack...."
+  #       wget -qO- https://raw.githubusercontent.com/eficode/wait-for/v2.2.3/wait-for | sh -s -- redisinsight:$$RIPORT -- echo Redisinsight is up
+  #       curl -s -X "POST" "http://redisinsight:$$RIPORT/api/instance/"   -H "Content-Type: application/json; charset=utf-8" -d '{"host": "redis-stack","name": "redis-stack","connectionType": "STANDALONE","port": 6379}'
+  #   networks:
+  #     - redis-network
+  #   depends_on:
+  #     - redisinsight
+  #     - redis-stack
 
 networks:
   redis-network:

nginx-ldap/docker-compose.yml

@@ -59,7 +59,7 @@ services:
 
 
   nginx-ldap-auth:
-    image: bitnami/nginx-ldap-auth-daemon
+    image: bitnami/nginx-ldap-auth-daemon-archived
     ports:
       - 8888:8888
     depends_on:
@@ -75,7 +75,7 @@ services:
       - "${NGINX_PORT:-12000}:${NGINX_PORT:-12000}"
     environment:
       - FORWARD_HOST=redisinsight
-      - FORWARD_PORT=${RIPORT:-8001}
+      - FORWARD_PORT=${RIPORT:-5540}
       - NGINX_PORT=${NGINX_PORT:-12000}
     depends_on:
       - redisinsight
@@ -98,33 +98,32 @@ services:
   #    - "./data/ldif/ad.ldif:/ldap/users.ldif"
 
   redisinsight:
-    image: redislabs/redisinsight
+    image: redis/redisinsight
     environment:
-      - RIPORT=${RIPORT:-8001}
-      - RITRUSTEDORIGINS=http://localhost:12000
+      - RIPORT=${RIPORT:-5540}
     depends_on:
       - redis-stack
     networks:
       - redis-network
 
 
-  redisinsight-redis-setup:
-    image: alpine
-    environment:
-      - RIPORT=${RIPORT:-8001}
-    command:
-      - sh
-      - -c
-      - |
-        apk add curl
-        echo "Adding redis-stack...."
-        wget -qO- https://raw.githubusercontent.com/eficode/wait-for/v2.2.3/wait-for | sh -s -- redisinsight:$$RIPORT -- echo Redisinsight is up
-        curl -s -X "POST" "http://redisinsight:$$RIPORT/api/instance/"   -H "Content-Type: application/json; charset=utf-8" -d '{"host": "redis-stack","name": "redis-stack","connectionType": "STANDALONE","port": 6379}'
-    networks:
-      - redis-network
-    depends_on:
-      - redisinsight
-      - redis-stack
+  # redisinsight-redis-setup:
+  #   image: alpine
+  #   environment:
+  #     - RIPORT=${RIPORT:-8001}
+  #   command:
+  #     - sh
+  #     - -c
+  #     - |
+  #       apk add curl
+  #       echo "Adding redis-stack...."
+  #       wget -qO- https://raw.githubusercontent.com/eficode/wait-for/v2.2.3/wait-for | sh -s -- redisinsight:$$RIPORT -- echo Redisinsight is up
+  #       curl -s -X "POST" "http://redisinsight:$$RIPORT/api/instance/"   -H "Content-Type: application/json; charset=utf-8" -d '{"host": "redis-stack","name": "redis-stack","connectionType": "STANDALONE","port": 6379}'
+  #   networks:
+  #     - redis-network
+  #   depends_on:
+  #     - redisinsight
+  #     - redis-stack
 
 networks:
   redis-network: