From 464e5fb4b2a001469d2c9110a02ea27870cc5838 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Mon, 18 Jan 2021 23:17:11 +0200 Subject: [PATCH 1/9] Added a new node version --- app/config/environments.php | 10 +++++++++- docker/environments/build.sh | 3 +++ docker/environments/node-15.6/Dockerfile | 9 +++++++++ .../Services/Functions/FunctionsCustomServerTest.php | 8 ++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 docker/environments/node-15.6/Dockerfile diff --git a/app/config/environments.php b/app/config/environments.php index 228e7e4608..ebd24b675c 100644 --- a/app/config/environments.php +++ b/app/config/environments.php @@ -3,7 +3,7 @@ * List of Appwrite Cloud Functions supported environments */ return [ - 'node-14' => [ + 'node-14.5' => [ 'name' => 'Node.js', 'version' => '14.5', 'base' => 'node:14.5-alpine', @@ -11,6 +11,14 @@ return [ 'build' => '/usr/src/code/docker/environments/node-14.5', 'logo' => 'node.png', ], + 'node-15.6' => [ + 'name' => 'Node.js', + 'version' => '15.6', + 'base' => 'node:14.5-alpine', + 'image' => 'appwrite/env-node-15.6:1.0.0', + 'build' => '/usr/src/code/docker/environments/node-15.6', + 'logo' => 'node.png', + ], 'php-7.4' => [ 'name' => 'PHP', 'version' => '7.4', diff --git a/docker/environments/build.sh b/docker/environments/build.sh index 0dc07947a8..ace0ece1e4 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 '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 +echo 'Node 15.6...' +docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-15.6:1.0.0 ./docker/environments/node-15.6/ --push + echo 'PHP 7.4...' docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-php-7.4:1.0.0 ./docker/environments/php-7.4/ --push diff --git a/docker/environments/node-15.6/Dockerfile b/docker/environments/node-15.6/Dockerfile new file mode 100644 index 0000000000..7cb1860fce --- /dev/null +++ b/docker/environments/node-15.6/Dockerfile @@ -0,0 +1,9 @@ +FROM node:15.6-alpine + +LABEL maintainer="team@appwrite.io" + +RUN apk add tar + +RUN mkdir /usr/local/src + +WORKDIR /usr/local/src/ \ No newline at end of file diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 377d728e11..f309a0f1d6 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -513,6 +513,14 @@ class FunctionsCustomServerTest extends Scope 'command' => 'node index.js', 'timeout' => 15, ], + [ + 'language' => 'Node.js', + 'version' => '15.6', + 'name' => 'node-15.6', + 'code' => $functions.'/node.tar.gz', + 'command' => 'node index.js', + 'timeout' => 15, + ], [ 'language' => 'Ruby', 'version' => '2.7', From 551de8438dbdaa54a0461f7718aeb4380144f76a Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 19 Jan 2021 00:09:42 +0200 Subject: [PATCH 2/9] Deploy tag with Travis --- .travis.yml | 6 ++++++ app/config/environments.php | 10 +++++----- docker/environments/build.sh | 4 ++-- .../environments/{node-15.6 => node-15.5}/Dockerfile | 2 +- .../Services/Functions/FunctionsCustomServerTest.php | 4 ++-- 5 files changed, 16 insertions(+), 10 deletions(-) rename docker/environments/{node-15.6 => node-15.5}/Dockerfile (82%) diff --git a/.travis.yml b/.travis.yml index afb64c0c8c..7d87604494 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,3 +34,9 @@ script: - docker-compose exec appwrite doctor - docker-compose exec appwrite vars - docker-compose exec appwrite test + +deploy: + - provider: script + script: docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-15.5:1.0.0 ./docker/environments/node-15.5/ --push + on: + branch: feat-new-node-version diff --git a/app/config/environments.php b/app/config/environments.php index ebd24b675c..8e2efac098 100644 --- a/app/config/environments.php +++ b/app/config/environments.php @@ -11,12 +11,12 @@ return [ 'build' => '/usr/src/code/docker/environments/node-14.5', 'logo' => 'node.png', ], - 'node-15.6' => [ + 'node-15.5' => [ 'name' => 'Node.js', - 'version' => '15.6', - 'base' => 'node:14.5-alpine', - 'image' => 'appwrite/env-node-15.6:1.0.0', - 'build' => '/usr/src/code/docker/environments/node-15.6', + 'version' => '15.5', + 'base' => 'node:15.5-alpine', + 'image' => 'appwrite/env-node-15.5:1.0.0', + 'build' => '/usr/src/code/docker/environments/node-15.5', 'logo' => 'node.png', ], 'php-7.4' => [ diff --git a/docker/environments/build.sh b/docker/environments/build.sh index ace0ece1e4..a1ce4fa19c 100644 --- a/docker/environments/build.sh +++ b/docker/environments/build.sh @@ -9,8 +9,8 @@ docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 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 -echo 'Node 15.6...' -docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-15.6:1.0.0 ./docker/environments/node-15.6/ --push +echo 'Node 15.5...' +docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-15.5:1.0.0 ./docker/environments/node-15.5/ --push echo 'PHP 7.4...' docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-php-7.4:1.0.0 ./docker/environments/php-7.4/ --push diff --git a/docker/environments/node-15.6/Dockerfile b/docker/environments/node-15.5/Dockerfile similarity index 82% rename from docker/environments/node-15.6/Dockerfile rename to docker/environments/node-15.5/Dockerfile index 7cb1860fce..823862bc12 100644 --- a/docker/environments/node-15.6/Dockerfile +++ b/docker/environments/node-15.5/Dockerfile @@ -1,4 +1,4 @@ -FROM node:15.6-alpine +FROM node:15.5-alpine LABEL maintainer="team@appwrite.io" diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index f309a0f1d6..5ab82a4dda 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -515,8 +515,8 @@ class FunctionsCustomServerTest extends Scope ], [ 'language' => 'Node.js', - 'version' => '15.6', - 'name' => 'node-15.6', + 'version' => '15.5', + 'name' => 'node-15.5', 'code' => $functions.'/node.tar.gz', 'command' => 'node index.js', 'timeout' => 15, From a22a6dd9d7e53946864e72bd825611fca46969d8 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 19 Jan 2021 00:16:58 +0200 Subject: [PATCH 3/9] Update Travis --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d87604494..d92e4ef178 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,15 +25,15 @@ before_install: - docker --version install: -- docker-compose up -d -- sleep 10 +# - docker-compose up -d +# - sleep 10 script: - docker ps -- docker-compose logs appwrite -- docker-compose exec appwrite doctor -- docker-compose exec appwrite vars -- docker-compose exec appwrite test +# - docker-compose logs appwrite +# - docker-compose exec appwrite doctor +# - docker-compose exec appwrite vars +# - docker-compose exec appwrite test deploy: - provider: script From c73a393641c74fc965e350dc807234476061d818 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 19 Jan 2021 00:25:18 +0200 Subject: [PATCH 4/9] Travis attempt #2 --- .travis.yml | 3 ++- deploy.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 deploy.sh diff --git a/.travis.yml b/.travis.yml index d92e4ef178..0819bbf578 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,7 @@ script: deploy: - provider: script - script: docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-15.5:1.0.0 ./docker/environments/node-15.5/ --push + edge: true + script: deploy.sh on: branch: feat-new-node-version diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000000..3a741f1be7 --- /dev/null +++ b/deploy.sh @@ -0,0 +1 @@ +docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-15.5:1.0.0 ./docker/environments/node-15.5/ --push \ No newline at end of file From 779fc25428abc79def63b4c343738a472bf65dd4 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 19 Jan 2021 00:28:17 +0200 Subject: [PATCH 5/9] Travis attempt #3 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0819bbf578..78b7087d12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ before_install: echo "${DOCKERHUB_PULL_PASSWORD}" | docker login --username "${DOCKERHUB_PULL_USERNAME}" --password-stdin fi - docker --version +- chmod u+x ./deploy.sh install: # - docker-compose up -d @@ -38,6 +39,6 @@ script: deploy: - provider: script edge: true - script: deploy.sh + script: ./deploy.sh on: branch: feat-new-node-version From e57aceb6fd4bff56279af6393a05ce6d4ea6cc13 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 19 Jan 2021 00:31:16 +0200 Subject: [PATCH 6/9] Travis attempt #4 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 78b7087d12..d5b763c6ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ before_install: echo "${DOCKERHUB_PULL_PASSWORD}" | docker login --username "${DOCKERHUB_PULL_USERNAME}" --password-stdin fi - docker --version +- docker buildx create --use - chmod u+x ./deploy.sh install: From 9a9c994c946cf53b003e39f264ca83bb32bdc4b2 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 19 Jan 2021 06:54:07 +0200 Subject: [PATCH 7/9] Revereted changes --- .travis.yml | 21 ++++++--------------- deploy.sh | 1 - 2 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 deploy.sh diff --git a/.travis.yml b/.travis.yml index d5b763c6ce..b17e8026f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,23 +23,14 @@ before_install: echo "${DOCKERHUB_PULL_PASSWORD}" | docker login --username "${DOCKERHUB_PULL_USERNAME}" --password-stdin fi - docker --version -- docker buildx create --use -- chmod u+x ./deploy.sh install: -# - docker-compose up -d -# - sleep 10 +- docker-compose up -d +- sleep 10 script: - docker ps -# - docker-compose logs appwrite -# - docker-compose exec appwrite doctor -# - docker-compose exec appwrite vars -# - docker-compose exec appwrite test - -deploy: - - provider: script - edge: true - script: ./deploy.sh - on: - branch: feat-new-node-version +- docker-compose logs appwrite +- docker-compose exec appwrite doctor +- docker-compose exec appwrite vars +- docker-compose exec appwrite test \ No newline at end of file diff --git a/deploy.sh b/deploy.sh deleted file mode 100644 index 3a741f1be7..0000000000 --- a/deploy.sh +++ /dev/null @@ -1 +0,0 @@ -docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-15.5:1.0.0 ./docker/environments/node-15.5/ --push \ No newline at end of file From e28b736667b3b7cbd61621daf9a2b74e24548ae5 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 19 Jan 2021 07:19:34 +0200 Subject: [PATCH 8/9] Fixed env name --- tests/e2e/Services/Functions/FunctionsCustomServerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 5ab82a4dda..10757e75cc 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -508,7 +508,7 @@ class FunctionsCustomServerTest extends Scope [ 'language' => 'Node.js', 'version' => '14.5', - 'name' => 'node-14', + 'name' => 'node-14.5', 'code' => $functions.'/node.tar.gz', 'command' => 'node index.js', 'timeout' => 15, From 4e565fbb2086dfb62d7cbce27193f43937eb4840 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 19 Jan 2021 09:23:31 +0200 Subject: [PATCH 9/9] Updated functions worker log --- app/workers/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/workers/functions.php b/app/workers/functions.php index 2712dc74f1..cc276ed522 100644 --- a/app/workers/functions.php +++ b/app/workers/functions.php @@ -34,7 +34,7 @@ Co\run(function() use ($environments) { // Warmup: make sure images are ready t $stdout = ''; $stderr = ''; - Console::info('Warming up '.$environment['name'].' environment...'); + Console::info('Warming up '.$environment['name'].' '.$environment['version'].' environment...'); Console::execute('docker pull '.$environment['image'], '', $stdout, $stderr);