From 56e2b7c18b18a332e92654a5a24727b9b14ae799 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 17 Mar 2021 11:04:24 +0545 Subject: [PATCH 1/4] dart 2.12 docker file --- docker/environments/dart-2.12/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 docker/environments/dart-2.12/Dockerfile diff --git a/docker/environments/dart-2.12/Dockerfile b/docker/environments/dart-2.12/Dockerfile new file mode 100644 index 0000000000..06740803a8 --- /dev/null +++ b/docker/environments/dart-2.12/Dockerfile @@ -0,0 +1,9 @@ +FROM google/dart:2.12 + +LABEL maintainer="team@appwrite.io" + +RUN apt-get update -y && apt-get install -y tar + +WORKDIR /usr/local/src/ + +ENV PUB_CACHE=/usr/local/src/.appwrite \ No newline at end of file From f430854e1e01d941a14dca78d0995b028b20b52d Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 17 Mar 2021 11:04:31 +0545 Subject: [PATCH 2/4] dart 2.12 environment support --- app/config/environments.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/config/environments.php b/app/config/environments.php index 9f1c5638e1..3dd4728c45 100644 --- a/app/config/environments.php +++ b/app/config/environments.php @@ -106,6 +106,15 @@ $environments = [ 'logo' => 'dart.png', 'supports' => [System::X86], ], + 'dart-2.12' => [ + 'name' => 'Dart', + 'version' => '2.12', + 'base' => 'google/dart:2.12', + 'image' => 'appwrite/env-dart-2.12:1.0.0', + 'build' => '/usr/src/code/docker/environments/dart-2.12', + 'logo' => 'dart.png', + 'supports' => [System::X86], + ], 'dotnet-3.1' => [ 'name' => '.NET', 'version' => '3.1', From a4be12a13cbfe8f7be28c749dc3deb0bc9617af3 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 17 Mar 2021 18:01:34 +0545 Subject: [PATCH 3/4] docker build env --- docker/environments/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/environments/build.sh b/docker/environments/build.sh index 1543c5814d..1385dc9e35 100644 --- a/docker/environments/build.sh +++ b/docker/environments/build.sh @@ -33,6 +33,9 @@ docker buildx build --platform linux/amd64,linux/arm64,linux/386,linux/ppc64le - echo 'Dart 2.10...' docker buildx build --platform linux/amd64 -t appwrite/env-dart-2.10:1.0.0 ./docker/environments/dart-2.10/ --push +echo 'Dart 2.12...' +docker buildx build --platform linux/amd64 -t appwrite/env-dart-2.12:1.0.0 ./docker/environments/dart-2.12/ --push + echo '.NET 3.1...' docker buildx build --platform linux/amd64,linux/arm64 -t appwrite/env-dotnet-3.1:1.0.0 ./docker/environments/dotnet-3.1/ --push From c8c4b11dad60b1a70c9a153d7cc1d199422d3d54 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 17 Mar 2021 18:13:42 +0545 Subject: [PATCH 4/4] test for dart 2.12 --- .../e2e/Services/Functions/FunctionsCustomServerTest.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 9dded8fdd7..c641c3805d 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -541,6 +541,14 @@ class FunctionsCustomServerTest extends Scope 'command' => 'dart main.dart', 'timeout' => 15, ], + [ + 'language' => 'Dart', + 'version' => '2.12', + 'name' => 'dart-2.12', + 'code' => $functions.'/dart.tar.gz', + 'command' => 'dart main.dart', + 'timeout' => 15, + ], [ 'language' => '.NET', 'version' => '3.1',