From ed90bc1d2463a33eed2e83d42f4ede95b0f17bb2 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 29 Mar 2021 12:49:42 +0545 Subject: [PATCH 1/4] deno 1.8 function env --- app/config/environments.php | 9 +++++++++ docker/environments/build.sh | 3 +++ docker/environments/deno-1.8/Dockerfile | 11 +++++++++++ .../Services/Functions/FunctionsCustomServerTest.php | 8 ++++++++ 4 files changed, 31 insertions(+) create mode 100644 docker/environments/deno-1.8/Dockerfile diff --git a/app/config/environments.php b/app/config/environments.php index 9f1c5638e1..0ae25ac5d1 100644 --- a/app/config/environments.php +++ b/app/config/environments.php @@ -97,6 +97,15 @@ $environments = [ 'logo' => 'deno.png', 'supports' => [System::X86, System::PPC, System::ARM], ], + 'deno-1.8' => [ + 'name' => 'Deno', + 'version' => '1.8', + 'base' => 'hayd/deno:alpine-1.8.2', + 'image' => 'appwrite/env-deno-1.8:1.0.0', + 'build' => '/usr/src/code/docker/environments/deno-1.6', + 'logo' => 'deno.png', + 'supports' => [System::X86, System::PPC, System::ARM], + ], 'dart-2.10' => [ 'name' => 'Dart', 'version' => '2.10', diff --git a/docker/environments/build.sh b/docker/environments/build.sh index 1543c5814d..50cc19f8e9 100644 --- a/docker/environments/build.sh +++ b/docker/environments/build.sh @@ -9,6 +9,9 @@ docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 echo 'Deno 1.6...' docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-deno-1.6:1.0.0 ./docker/environments/deno-1.6/ --push +echo 'Deno 1.8...' +docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-deno-1.8:1.0.0 ./docker/environments/deno-1.8/ --push + echo 'Node 14.5...' docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-14.5:1.0.0 ./docker/environments/node-14.5/ --push diff --git a/docker/environments/deno-1.8/Dockerfile b/docker/environments/deno-1.8/Dockerfile new file mode 100644 index 0000000000..b07df9f785 --- /dev/null +++ b/docker/environments/deno-1.8/Dockerfile @@ -0,0 +1,11 @@ +FROM hayd/deno:alpine-1.8.2 + +LABEL maintainer="team@appwrite.io" + +RUN apk add tar + +RUN mkdir /usr/local/src + +WORKDIR /usr/local/src/ + +ENV DENO_DIR=/usr/local/src/.appwrite \ No newline at end of file diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index b04a635cf0..7f152a8df1 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -533,6 +533,14 @@ class FunctionsCustomServerTest extends Scope 'command' => 'deno run --allow-env index.ts', 'timeout' => 15, ], + [ + 'language' => 'Deno', + 'version' => '1.8', + 'name' => 'deno-1.8', + 'code' => $functions.'/deno.tar.gz', + 'command' => 'deno run --allow-env index.ts', + 'timeout' => 15, + ], [ 'language' => 'Dart', 'version' => '2.10', From 617edbf3ff7f93f38a074933e3b39252f8f2cf4a Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 29 Mar 2021 13:14:51 +0545 Subject: [PATCH 2/4] fix deno 1.8 env --- app/config/environments.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/environments.php b/app/config/environments.php index 0ae25ac5d1..6ad1b4973f 100644 --- a/app/config/environments.php +++ b/app/config/environments.php @@ -102,7 +102,7 @@ $environments = [ 'version' => '1.8', 'base' => 'hayd/deno:alpine-1.8.2', 'image' => 'appwrite/env-deno-1.8:1.0.0', - 'build' => '/usr/src/code/docker/environments/deno-1.6', + 'build' => '/usr/src/code/docker/environments/deno-1.8', 'logo' => 'deno.png', 'supports' => [System::X86, System::PPC, System::ARM], ], From e55f62a0a593bfe15473bf62ec4fc03f50126a87 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 7 Apr 2021 12:30:05 +0545 Subject: [PATCH 3/4] deno 1.8.3 upgrade --- docker/environments/build.sh | 2 +- docker/environments/deno-1.8/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/environments/build.sh b/docker/environments/build.sh index 50cc19f8e9..eec2f0b7bb 100644 --- a/docker/environments/build.sh +++ b/docker/environments/build.sh @@ -10,7 +10,7 @@ echo 'Deno 1.6...' docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-deno-1.6:1.0.0 ./docker/environments/deno-1.6/ --push echo 'Deno 1.8...' -docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-deno-1.8:1.0.0 ./docker/environments/deno-1.8/ --push +docker buildx build --platform linux/amd64,linux/386 -t appwrite/env-deno-1.8:1.0.0 ./docker/environments/deno-1.8/ --push echo 'Node 14.5...' docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-14.5:1.0.0 ./docker/environments/node-14.5/ --push diff --git a/docker/environments/deno-1.8/Dockerfile b/docker/environments/deno-1.8/Dockerfile index b07df9f785..e064614473 100644 --- a/docker/environments/deno-1.8/Dockerfile +++ b/docker/environments/deno-1.8/Dockerfile @@ -1,4 +1,4 @@ -FROM hayd/deno:alpine-1.8.2 +FROM hayd/deno:alpine-1.8.3 LABEL maintainer="team@appwrite.io" From 4e24c5aa460fac909133c190375ff91b4998057f Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 7 Apr 2021 12:30:50 +0545 Subject: [PATCH 4/4] default functions env contains latest deno --- app/config/variables.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/variables.php b/app/config/variables.php index 20b49bd9e8..382619ed97 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -381,7 +381,7 @@ return [ 'name' => '_APP_FUNCTIONS_ENVS', '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.7.0', - 'default' => 'node-14.5,deno-1.6,php-7.4,python-3.8,ruby-3.0,dotnet-5.0', + 'default' => 'node-14.5,deno-1.8,php-7.4,python-3.8,ruby-3.0,dotnet-5.0', 'required' => false, 'question' => '', ],