keep only PHP_UPLOAD_TMP_DIR env in fpm and setup containers

alchemy-fr · Oct 10, 2024 · 4768265 · 4768265
1 parent 9b0ced9
commit 4768265
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -306,7 +306,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -375,7 +374,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -428,7 +426,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -480,7 +477,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -533,7 +529,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -585,7 +580,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -637,7 +631,6 @@ services:
       - SESSION_CACHE_LIMITER
       - PHP_LOG_LEVEL
       - PHP_CLI_MEMORY_LIMIT
-      - PHP_UPLOAD_TMP_DIR
       - LC_MESSAGES=C.UTF-8
       - LC_COLLATE=C.UTF-8
       - LC_IDENTIFICATION=C.UTF-8
@@ -689,7 +682,6 @@ services:
       - SESSION_CACHE_LIMITER
       - PHP_LOG_LEVEL
       - PHP_CLI_MEMORY_LIMIT
-      - PHP_UPLOAD_TMP_DIR
       - LC_MESSAGES=C.UTF-8
       - LC_COLLATE=C.UTF-8
       - LC_IDENTIFICATION=C.UTF-8
@@ -741,7 +733,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -793,7 +784,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -845,7 +835,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -897,7 +886,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -949,7 +937,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -1004,7 +991,6 @@ services:
       - SESSION_CACHE_LIMITER
       - PHP_LOG_LEVEL
       - PHP_CLI_MEMORY_LIMIT
-      - PHP_UPLOAD_TMP_DIR
       - LC_MESSAGES=C.UTF-8
       - LC_COLLATE=C.UTF-8
       - LC_IDENTIFICATION=C.UTF-8
@@ -1056,7 +1042,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -1108,7 +1093,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -1160,7 +1144,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -1212,7 +1195,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -1264,7 +1246,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -1316,7 +1297,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR 
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
@@ -1367,7 +1347,6 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     - PHP_CLI_MEMORY_LIMIT
-    - PHP_UPLOAD_TMP_DIR 
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8

diff --git a/docker/phraseanet/php.ini.worker.sample b/docker/phraseanet/php.ini.worker.sample
@@ -817,7 +817,7 @@ file_uploads = On
 ; Temporary directory for HTTP uploaded files (will use system default if not
 ; specified).
 ; http://php.net/upload-tmp-dir
-; upload_tmp_dir = $PHP_UPLOAD_TMP_DIR
+;upload_tmp_dir = 
 
 ; Maximum allowed size for uploaded files.
 ; http://php.net/upload-max-filesize