Merge branch 'master' of github.com:appwrite/appwrite into response-refactor

CHANGES.md

@@ -18,7 +18,8 @@
 - Upgraded Redis Resque queue library to version 1.3.6
 - Added container names to docker-compose.yml (@drandell)
 - Upgraded ClamAV container image to version 1.0.9
-- - New and consistent response format for all API object + new response examples in the docs
+- Optimised function execution by using fully-qualified function calls
+- New and consistent response format for all API object + new response examples in the docs
   - Removed user roles attribute from user object (can be fetched from /v1/teams/memberships) **
   - Removed type attribute from session object response (used only internally)
   - ** - might be changed before merging to master
@@ -35,6 +36,8 @@
 - Fixed update form labels and tooltips for Flutter Android apps
 - Fixed missing custom scopes param for OAuth2 session create API route
 - Fixed wrong JSON validation when creating and updating database documnets
+- Fixed bug where max file size was limited to max of 10MB
+- Fixed bug preventing the deletion of the project logo
 
 ## Security
 

Dockerfile

@@ -130,13 +130,12 @@ RUN \
 # Set Upload Limit (default to 100MB)
 RUN echo "upload_max_filesize = ${_APP_STORAGE_LIMIT}" >> /etc/php/$PHP_VERSION/fpm/conf.d/appwrite.ini
 RUN echo "post_max_size = ${_APP_STORAGE_LIMIT}" >> /etc/php/$PHP_VERSION/fpm/conf.d/appwrite.ini
-RUN echo "env[TESTME] = your-secret-key" >> /etc/php/$PHP_VERSION/fpm/conf.d/appwrite.ini
 
 # Add logs file
 RUN echo "" >> /var/log/appwrite.log
 
 # Nginx Configuration (with self-signed ssl certificates)
-COPY ./docker/nginx.conf /etc/nginx/nginx.conf
+COPY ./docker/nginx.conf.template /etc/nginx/nginx.conf.template
 COPY ./docker/ssl/cert.pem /etc/nginx/ssl/cert.pem
 COPY ./docker/ssl/key.pem /etc/nginx/ssl/key.pem
 

bin/start

@@ -4,6 +4,8 @@ export PHP_VERSION=$PHP_VERSION
 
 chown -Rf www-data.www-data /usr/share/nginx/html/
 
+sed 's/%_APP_STORAGE_LIMIT%/'$_APP_STORAGE_LIMIT'/g' /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
+
 # Function to update the fpm configuration to make the service environment variables available
 function setEnvironmentVariable() {
     if [ -z "$2" ]; then

docker-compose.yml

@@ -54,7 +54,6 @@ services:
       - ./docs:/usr/share/nginx/html/docs
       - ./public:/usr/share/nginx/html/public
       - ./src:/usr/share/nginx/html/src
-      - ./docker/nginx.conf:/etc/nginx/nginx.conf
     depends_on:
       - mariadb
       - redis

docker/nginx.conf.template

@@ -16,7 +16,7 @@ http {
 	tcp_nodelay on;
 	keepalive_timeout 65;
 	types_hash_max_size 2048;
-	client_max_body_size 10M;
+	client_max_body_size %_APP_STORAGE_LIMIT%;
 
 	# server_names_hash_bucket_size 64;
 	# server_name_in_redirect off;