From a7c81c0d28f02e229ab0d90b8dbfa888c338027c Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Fri, 21 Jan 2022 11:11:39 -0500 Subject: [PATCH 1/4] Pin to patch version to avoid regressions --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f8192427..e9e08f5a8 100755 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ COPY public /usr/local/src/public RUN npm ci RUN npm run build -FROM php:8.0-cli-alpine as compile +FROM php:8.0.14-cli-alpine as compile ARG DEBUG=false ENV DEBUG=$DEBUG @@ -123,7 +123,7 @@ RUN \ ./configure && \ make && make install -FROM php:8.0-cli-alpine as final +FROM php:8.0.14-cli-alpine as final LABEL maintainer="team@appwrite.io" From 7566547ff38a03ad9bb261ca262f16d6b8c19171 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Fri, 21 Jan 2022 11:21:52 -0500 Subject: [PATCH 2/4] Pin alpine where possible --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e9e08f5a8..eda20f73a 100755 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \ --no-plugins --no-scripts --prefer-dist \ `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi` -FROM node:16-alpine as node +FROM node:16-alpine3.15 as node WORKDIR /usr/local/src/ @@ -24,7 +24,7 @@ COPY public /usr/local/src/public RUN npm ci RUN npm run build -FROM php:8.0.14-cli-alpine as compile +FROM php:8.0.14-cli-alpine3.15 as compile ARG DEBUG=false ENV DEBUG=$DEBUG @@ -123,7 +123,7 @@ RUN \ ./configure && \ make && make install -FROM php:8.0.14-cli-alpine as final +FROM php:8.0.14-cli-alpine3.15 as final LABEL maintainer="team@appwrite.io" From 43f65a3b2cf5d34ae0b883f982df44ff870e4a33 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Fri, 21 Jan 2022 11:31:08 -0500 Subject: [PATCH 3/4] Pin to specific node version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eda20f73a..a4ae5c156 100755 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \ --no-plugins --no-scripts --prefer-dist \ `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi` -FROM node:16-alpine3.15 as node +FROM node:16.13.2-alpine3.15 as node WORKDIR /usr/local/src/ From 7ddcf4142e3b18cd9446b6a71009c9c553ba2137 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Fri, 21 Jan 2022 12:53:13 -0500 Subject: [PATCH 4/4] Briefly sleep to give realtime a chance to disconnect --- tests/e2e/Services/Realtime/RealtimeBase.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/e2e/Services/Realtime/RealtimeBase.php b/tests/e2e/Services/Realtime/RealtimeBase.php index 277537d40..4357bec38 100644 --- a/tests/e2e/Services/Realtime/RealtimeBase.php +++ b/tests/e2e/Services/Realtime/RealtimeBase.php @@ -66,6 +66,7 @@ trait RealtimeBase $this->assertEquals('error', $payload['type']); $this->assertEquals(1008, $payload['data']['code']); $this->assertEquals('Missing or unknown project ID', $payload['data']['message']); + \usleep(250000); // 250ms $this->expectException(ConnectionException::class); // Check if server disconnnected client $client->close(); }