appwrite · eldadfux · Apr 29, 2021 · Oct 27, 2020 · Oct 27, 2020 · Oct 27, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,8 @@ before_install:
 - docker buildx create --use
 - chmod -R u+x ./.travis-ci
 - export COMPOSE_INTERACTIVE_NO_CLI=1
+# Only pass a single runtime for CI stability
+- echo "_APP_FUNCTIONS_ENVS=php-8.0" >> .env
 
 install:
 - docker-compose up -d

diff --git a/CHANGES.md b/CHANGES.md
@@ -17,6 +17,7 @@
 - Enabled 501 errors (Not Implemented) from the error handler
 - Added Python 3.9 as a new Cloud Functions runtime
 - Added Deno 1.8 as a new Cloud Functions runtime (#989)
+- Upgraded to PHP 8.0 (#713)
 - ClamAV is now disabled by default to allow lower min requirments for Appwrite (#1064)
 - Added a new env var named `_APP_LOCALE` that allow to change the default `en` locale value (#1056)
 - Updated all the console bottom control to be consistent. Dropped the `+` icon (#1062)
@@ -30,9 +31,12 @@
 ## Breaking Changes (Read before upgrading!)
 
 - Rename `deleteuser` to `delete` on Users Api
+- Environment variable `_APP_FUNCTIONS_ENVS` renamed to `_APP_FUNCTIONS_RUNTIMES`
 - Only logged in users can execute functions (for guests, use anonymous login)
 - Only the user who has triggered the execution get access to the relevant execution logs
-- Function execution env `APPWRITE_FUNCTION_EVENT_PAYLOAD` renamed to `APPWRITE_FUNCTION_EVENT_DATA`
+- Function execution environment variable `APPWRITE_FUNCTION_EVENT_PAYLOAD` renamed to `APPWRITE_FUNCTION_EVENT_DATA`
+- Function execution environment variable `APPWRITE_FUNCTION_ENV_NAME` renamed to `APPWRITE_FUNCTION_RUNTIME_NAME`
+- Function execution environment variable `APPWRITE_FUNCTION_ENV_VERSION` renamed to `APPWRITE_FUNCTION_RUNTIME_VERSION`
 - Introdcues rate limits for:
   - Team invite (10 requests in every 60 minutes per IP address)
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -278,13 +278,9 @@ Before running the command, make sure you have proper write permissions to the A
 ```bash
 docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x -t appwrite/appwrite:dev --push .
 ```
-**Build Functions Envs**
+**Build Functions Runtimes**
 
-Build envs for all supported cloud functions (multicore builds)
-
-```bash
-bash ./docker/environments/build.sh
-```
+The Runtimes for all supported cloud functions (multicore builds) can be found at the [appwrite/php-runtimes](https://github
10000
.com/appwrite/php-runtimes) repository.
 
 ## Tests
 

diff --git a/Dockerfile b/Dockerfile
@@ -12,12 +12,13 @@ RUN composer update --ignore-platform-reqs --optimize-autoloader \
     --no-plugins --no-scripts --prefer-dist \
     `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
 
-FROM php:7.4-cli-alpine as step1
+FROM php:8.0-cli-alpine as step1
 
-ENV PHP_REDIS_VERSION=5.3.3 \
-    PHP_SWOOLE_VERSION=v4.5.8 \
-    PHP_MAXMINDDB_VERSION=v1.10.0 \
-    PHP_XDEBUG_VERSION=sdebug_2_9-beta
+ENV PHP_REDIS_VERSION=5.3.4 \
+    PHP_SWOOLE_VERSION=v4.6.6 \
+    PHP_IMAGICK_VERSION=master \
+    PHP_YAML_VERSION=2.2.1 \
+    PHP_MAXMINDDB_VERSION=v1.10.1
 
 RUN \
   apk add --no-cache --virtual .deps \
@@ -29,38 +30,52 @@ RUN \
   git \
   zlib-dev \
   brotli-dev \
+  yaml-dev \
+  imagemagick \
+  imagemagick-dev \
   libmaxminddb-dev
 
 RUN docker-php-ext-install sockets
 
 RUN \
   # Redis Extension
-  git clone https://github.com/phpredis/phpredis.git && \
+  git clone --depth 1 --branch $PHP_REDIS_VERSION https://github.com/phpredis/phpredis.git && \
   cd phpredis && \
-  git checkout $PHP_REDIS_VERSION && \
   phpize && \
   ./configure && \
   make && make install && \
   cd .. && \
   ## Swoole Extension
-  git clone https://github.com/swoole/swoole-src.git && \
+  git clone --depth 1 --branch $PHP_SWOOLE_VERSION https://github.com/swoole/swoole-src.git && \
   cd swoole-src && \
-  git checkout $PHP_SWOOLE_VERSION && \
   phpize && \
-  ./configure --enable-sockets --enable-http2 && \
+  ./configure --enable-http2 && \
+  make && make install && \
+  cd .. && \
+  ## Imagick Extension
+  git clone --depth 1 --branch $PHP_IMAGICK_VERSION https://github.com/Imagick/imagick && \
+  cd imagick && \
+  phpize && \
+  ./configure && \
+  make && make install && \
+  cd .. && \
+  ## YAML Extension
+  git clone --depth 1 --branch $PHP_YAML_VERSION https://github.com/php/pecl-file_formats-yaml && \
+  cd pecl-file_formats-yaml && \
+  phpize && \
+  ./configure && \
   make && make install && \
   cd .. && \
   ## Maxminddb extension
-  git clone https://github.com/maxmind/MaxMind-DB-Reader-php.git && \
+  git clone --depth 1 --branch $PHP_MAXMINDDB_VERSION https://github.com/maxmind/MaxMind-DB-Reader-php.git && \
   cd MaxMind-DB-Reader-php && \
-  git checkout $PHP_MAXMINDDB_VERSION && \
   cd ext && \
   phpize && \
   ./configure && \
   make && make install && \
   cd ../..
 
-FROM php:7.4-cli-alpine as final
+FROM php:8.0-cli-alpine as final
 
 LABEL maintainer="team@appwrite.io"
 
@@ -124,26 +139,26 @@ RUN \
   curl-dev \
   && apk add --no-cache \
   libstdc++ \
+  certbot \
+  brotli-dev \
   yaml-dev \
   imagemagick \
-  imagemagick-dev \
+  libmaxminddb-dev \
   certbot \
   docker-cli \
   docker-compose \
-  libmaxminddb \
-  libmaxminddb-dev \
-  && pecl install imagick yaml \ 
-  && docker-php-ext-enable imagick yaml \
   && docker-php-ext-install sockets opcache pdo_mysql \
   && apk del .deps \
   && rm -rf /var/cache/apk/*
 
 WORKDIR /usr/src/code
 
 COPY --from=step0 /usr/local/src/vendor /usr/src/code/vendor
-COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/
-COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/redis.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/
-COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/maxminddb.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/ 
+COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20200930/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
+COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20200930/redis.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
+COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20200930/imagick.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
+COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20200930/yaml.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
+COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20200930/maxminddb.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/ 
 
 # Add Source Code
 COPY ./app /usr/src/code/app
@@ -191,11 +206,15 @@ RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
 # Enable Extensions
 RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini
 RUN echo extension=redis.so >> /usr/local/etc/php/conf.d/redis.ini
+RUN echo extension=imagick.so >> /usr/local/etc/php/conf.d/imagick.ini
+RUN echo extension=yaml.so >> /usr/local/etc/php/conf.d/yaml.ini
 RUN echo extension=maxminddb.so >> /usr/local/etc/php/conf.d/maxminddb.ini
 
 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 "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
 

diff --git a/app/config/environments.php b/app/config/environments.php
diff --git a/app/config/runtimes.php b/app/config/runtimes.php
@@ -0,0 +1,15 @@
+<?php
+
+use Utopia\App;
+use Appwrite\Runtimes\Runtimes;
+
+/**
+ * List of Appwrite Cloud Functions supported runtimes
+ */
+$runtimes = new Runtimes();
+
+$allowList = empty(App::getEnv('_APP_FUNCTIONS_RUNTIMES')) ? [] : \explode(',', App::getEnv('_APP_FUNCTIONS_RUNTIMES'));
+
+$runtimes = $runtimes->getAll(filter: $allowList);
+
+return $runtimes;
diff --git a/app/config/variables.php b/app/config/variables.php
@@ -386,8 +386,16 @@
                 'question' => '',
             ],
             [
-                'name' => '_APP_FUNCTIONS_ENVS',
+                'name' => '_APP_FUNCTIONS_RUNTIMES',
                 'description' => 'This option allows you to limit the available environments for cloud functions. This option is very useful for low-cost servers to safe disk space.\n\nTo enable/activate this option, pass a list of allowed environments separated by a comma.\n\nCurrently, supported environments are: ' . \implode(', ', \array_keys(Config::getParam('providers'))),
+                'introduction' => '0.8.0',
+                'default' => 'node-15.5,deno-1.8,php-8.0,python-3.9,ruby-3.0,dotnet-5.0',
+                'required' => false,
+                'question' => '',
+            ],
+            [
+                'name' => '_APP_FUNCTIONS_ENVS',
+                'description' => 'Deprectated with 0.8.0, use \'_APP_FUNCTIONS_RUNTIMES\' instead!',
                 'introduction' => '0.7.0',
                 'default' => 'node-14.5,deno-1.8,php-7.4,python-3.9,ruby-3.0,dotnet-5.0',
                 'required' => false,

diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
@@ -39,7 +39,7 @@
     ->label('sdk.response.model', Response::MODEL_FUNCTION)
     ->param('name', '', new Text(128), 'Function name. Max length: 128 chars.')
     ->param('execute', [], new ArrayList(new Text(64)), 'An array of strings with execution permissions. By default no user is granted with any execute permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
-    ->param('env', '', new WhiteList(array_keys(Config::getParam('environments')), true), 'Execution enviornment.')
+    ->param('env', '', new WhiteList(array_keys(Config::getParam('runtimes')), true), 'Execution enviornment.')
     ->param('vars', [], new Assoc(), 'Key-value JSON object.', true)
     ->param('events', [], new ArrayList(new WhiteList(array_keys(Config::getParam('events')), true)), 'Events list.', true)
     ->param('schedule', '', new Cron(), 'Schedule CRON syntax.', true)