From 6e4eb348c19d60002f33bf6fb6495ebf33729707 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Fri, 23 Feb 2024 19:34:54 +1300 Subject: [PATCH] Remove preloading --- Dockerfile | 9 +------ composer.json | 1 - composer.lock | 67 +++++----------------------------------------- docker-compose.yml | 1 - 4 files changed, 8 insertions(+), 70 deletions(-) diff --git a/Dockerfile b/Dockerfile index a61d15ac4f..a6d61a18e3 100755 --- a/Dockerfile +++ b/Dockerfile @@ -133,16 +133,9 @@ RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/ # Enable Extensions RUN if [ "$DEBUG" == "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi -RUN if [ "$DEBUG" == "true" ]; then echo "opcache.enable=0" >> /usr/local/etc/php/conf.d/appwrite.ini; fi RUN if [ "$DEBUG" = "false" ]; then rm -rf /usr/src/code/dev; fi RUN if [ "$DEBUG" = "false" ]; then rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20220829/xdebug.so; fi -RUN echo "opcache.preload_user=www-data" >> /usr/local/etc/php/conf.d/appwrite.ini -RUN echo "opcache.preload=/usr/src/code/app/preload.php" >> /usr/local/etc/php/conf.d/appwrite.ini -RUN echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/appwrite.ini -RUN echo "default_socket_timeout=-1" >> /usr/local/etc/php/conf.d/appwrite.ini -RUN echo "opcache.jit_buffer_size=100M" >> /usr/local/etc/php/conf.d/appwrite.ini -RUN echo "opcache.jit=1235" >> /usr/local/etc/php/conf.d/appwrite.ini EXPOSE 80 -CMD [ "php", "app/http.php", "-dopcache.preload=opcache.preload=/usr/src/code/app/preload.php" ] \ No newline at end of file +CMD [ "php", "app/http.php" ] \ No newline at end of file diff --git a/composer.json b/composer.json index b1a0c25445..a53d47a3fa 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,6 @@ "utopia-php/orchestration": "0.9.*", "utopia-php/platform": "0.5.*", "utopia-php/pools": "0.4.*", - "utopia-php/preloader": "0.2.*", "utopia-php/queue": "0.7.*", "utopia-php/registry": "0.5.*", "utopia-php/storage": "0.18.*", diff --git a/composer.lock b/composer.lock index ab4b3c8829..bca3e557bc 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": "510f3498b35c5ec3289b7bed6a2ef9c9", + "content-hash": "37887fb414be6480280484aa41c0df9d", "packages": [ { "name": "adhocore/jwt", @@ -2218,59 +2218,6 @@ }, "time": "2022-11-22T07:55:45+00:00" }, - { - "name": "utopia-php/preloader", - "version": "0.2.4", - "source": { - "type": "git", - "url": "https://github.com/utopia-php/preloader.git", - "reference": "65ef48392e72172f584b0baa2e224f9a1cebcce0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/utopia-php/preloader/zipball/65ef48392e72172f584b0baa2e224f9a1cebcce0", - "reference": "65ef48392e72172f584b0baa2e224f9a1cebcce0", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^9.3", - "vimeo/psalm": "4.0.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Utopia\\Preloader\\": "src/Preloader" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eldad Fux", - "email": "team@appwrite.io" - } - ], - "description": "Utopia Preloader library is simple and lite library for managing PHP preloading configuration", - "keywords": [ - "framework", - "php", - "preload", - "preloader", - "preloading", - "upf", - "utopia" - ], - "support": { - "issues": "https://github.com/utopia-php/preloader/issues", - "source": "https://github.com/utopia-php/preloader/tree/0.2.4" - }, - "time": "2020-10-24T07:04:59+00:00" - }, { "name": "utopia-php/queue", "version": "0.7.0", @@ -3131,16 +3078,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.0.0", + "version": "v5.0.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc" + "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc", - "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69", + "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69", "shasum": "" }, "require": { @@ -3183,9 +3130,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.1" }, - "time": "2024-01-07T17:17:35+00:00" + "time": "2024-02-21T19:24:10+00:00" }, { "name": "phar-io/manifest", diff --git a/docker-compose.yml b/docker-compose.yml index f5754b4b09..3d96b5059c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -92,7 +92,6 @@ services: - php - -e - app/http.php - - -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php environment: - _APP_ENV - _APP_WORKER_PER_CORE