From 9505d30d4369ca65eb31b4eb4321eae6782021dc Mon Sep 17 00:00:00 2001
From: fogelito <fogelshmuel@gmail.com>
Date: Thu, 12 Oct 2023 17:00:38 +0300
Subject: [PATCH] docker-compose.yml

---
 composer.lock      | 51 +++++++++++++++++++++++++++-------------------
 docker-compose.yml | 10 +++------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/composer.lock b/composer.lock
index 8c9db35f78..d52df71a2f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "13a3bdc7c1dec5756bf58ec73a49753d",
+    "content-hash": "f97d60b77dae0ce5fd9b57903cdebe55",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -1050,16 +1050,16 @@
         },
         {
             "name": "matomo/device-detector",
-            "version": "6.1.5",
+            "version": "6.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/matomo-org/device-detector.git",
-                "reference": "40ca2990dba2c1719e5c62168e822e0b86c167d4"
+                "reference": "5cbea85106e561c7138d03603eb6e05128480409"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/40ca2990dba2c1719e5c62168e822e0b86c167d4",
-                "reference": "40ca2990dba2c1719e5c62168e822e0b86c167d4",
+                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/5cbea85106e561c7138d03603eb6e05128480409",
+                "reference": "5cbea85106e561c7138d03603eb6e05128480409",
                 "shasum": ""
             },
             "require": {
@@ -1115,7 +1115,7 @@
                 "source": "https://github.com/matomo-org/matomo",
                 "wiki": "https://dev.matomo.org/"
             },
-            "time": "2023-08-17T16:17:41+00:00"
+            "time": "2023-10-02T10:01:54+00:00"
         },
         {
             "name": "mongodb/mongodb",
@@ -2152,16 +2152,16 @@
         },
         {
             "name": "utopia-php/database",
-            "version": "0.43.4",
+            "version": "0.43.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/database.git",
-                "reference": "cabdd02e8dc1732eb0b22007c511e7bb3caa5c8c"
+                "reference": "5f7b05189cfbcc0506090498c580c5765375a00a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/cabdd02e8dc1732eb0b22007c511e7bb3caa5c8c",
-                "reference": "cabdd02e8dc1732eb0b22007c511e7bb3caa5c8c",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/5f7b05189cfbcc0506090498c580c5765375a00a",
+                "reference": "5f7b05189cfbcc0506090498c580c5765375a00a",
                 "shasum": ""
             },
             "require": {
@@ -2202,9 +2202,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/0.43.4"
+                "source": "https://github.com/utopia-php/database/tree/0.43.5"
             },
-            "time": "2023-09-28T09:00:05+00:00"
+            "time": "2023-10-06T06:49:47+00:00"
         },
         {
             "name": "utopia-php/domains",
@@ -2988,16 +2988,16 @@
         },
         {
             "name": "utopia-php/storage",
-            "version": "0.17.0",
+            "version": "dev-s3-getfiles",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/storage.git",
-                "reference": "efec5376c02d3d8330f1beb1469e6d6e313e21ee"
+                "reference": "0bd69e11152029e1a3bdb83264d174304d78fde7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/storage/zipball/efec5376c02d3d8330f1beb1469e6d6e313e21ee",
-                "reference": "efec5376c02d3d8330f1beb1469e6d6e313e21ee",
+                "url": "https://api.github.com/repos/utopia-php/storage/zipball/0bd69e11152029e1a3bdb83264d174304d78fde7",
+                "reference": "0bd69e11152029e1a3bdb83264d174304d78fde7",
                 "shasum": ""
             },
             "require": {
@@ -3037,9 +3037,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/storage/issues",
-                "source": "https://github.com/utopia-php/storage/tree/0.17.0"
+                "source": "https://github.com/utopia-php/storage/tree/s3-getfiles"
             },
-            "time": "2023-08-21T11:28:36+00:00"
+            "time": "2023-10-12T09:14:45+00:00"
         },
         {
             "name": "utopia-php/swoole",
@@ -5993,9 +5993,18 @@
             "time": "2023-08-28T11:09:02+00:00"
         }
     ],
-    "aliases": [],
+    "aliases": [
+        {
+            "package": "utopia-php/storage",
+            "version": "dev-s3-getfiles",
+            "alias": "0.16.0",
+            "alias_normalized": "0.16.0.0"
+        }
+    ],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "utopia-php/storage": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -6019,5 +6028,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 18d5b7b6cf..659b2da8a2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -123,10 +123,6 @@ services:
       - _APP_DB_PASS
       - _APP_CONNECTIONS_MAX
       - _APP_POOL_CLIENTS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
       - _APP_CONNECTIONS_DB_PROJECT
       - _APP_CONNECTIONS_DB_REPLICAS
       - _APP_CONNECTIONS_DB_CONSOLE
@@ -843,12 +839,12 @@ services:
     user: 'root:root'
 
   appwrite-backup:
+    image: appwrite-dev
+    <<: *x-logging
     entrypoint: db-backup
     command:
       - --database=db_fra1_03
-    <<: *x-logging
     container_name: appwrite-backup
-    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -882,8 +878,8 @@ services:
 
   redis:
     image: redis:7.0.4-alpine
-    <<: *x-logging
     container_name: appwrite-redis
+    <<: *x-logging
     command: >
       redis-server
       --maxmemory            512mb