From d9bd205399b48d3f32d0e73f0dd84bed0e339738 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 18 Aug 2021 13:23:15 +0200 Subject: [PATCH 1/7] docker(traefik): update to 2.5 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d762f9a6df..7e0879ca5d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ version: '3' services: traefik: - image: traefik:2.3 + image: traefik:2.5 container_name: appwrite-traefik command: - --log.level=DEBUG From 474a283cc188216f9d9163c9d020fe86172a8b57 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 18 Aug 2021 13:24:25 +0200 Subject: [PATCH 2/7] docker(traefik): update to 2.5 --- app/views/install/compose.phtml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index c110fcd4eb..95e33b9ea2 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -9,7 +9,7 @@ $image = $this->getParam('image', ''); services: traefik: - image: traefik:2.3 + image: traefik:2.5 container_name: appwrite-traefik command: - --providers.file.directory=/storage/config diff --git a/docker-compose.yml b/docker-compose.yml index 31f673c2af..86b1e4dc23 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ version: '3' services: traefik: - image: traefik:2.3 + image: traefik:2.5 container_name: appwrite-traefik command: - --log.level=DEBUG From 6a2c8c1478e1781fad3d1bc409572843f60f6ec8 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 18 Aug 2021 13:29:48 +0200 Subject: [PATCH 3/7] deps(php): update swoole and imagick --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d15dbf508e..5b2224323c 100755 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,8 @@ ARG DEBUG=false ENV DEBUG=$DEBUG ENV PHP_REDIS_VERSION=5.3.4 \ - PHP_SWOOLE_VERSION=v4.6.7 \ - PHP_IMAGICK_VERSION=3.5.0 \ + PHP_SWOOLE_VERSION=v4.7.0 \ + PHP_IMAGICK_VERSION=3.5.1 \ PHP_YAML_VERSION=2.2.1 \ PHP_MAXMINDDB_VERSION=v1.10.1 From decda35331502ede4c4c1c7d769a518dce5e2d2c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 18 Aug 2021 14:18:42 +0200 Subject: [PATCH 4/7] ci(travis): change arm to arm64-graviton2 architecture --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af63bd6030..c3f8f21f75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ dist: xenial arch: - amd64 - - arm64 + - arm64-graviton2 os: linux From bf18610819a5ad5b0c219297ee7fb643444db7ab Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 18 Aug 2021 14:28:24 +0200 Subject: [PATCH 5/7] ci(travis): move from xenial to focal distro --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c3f8f21f75..8c2100d3e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: xenial +dist: focal arch: - amd64 From 00ec0a1f9d0c6fd59ce7274aa7281c6c182c2a62 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 18 Aug 2021 14:54:30 +0200 Subject: [PATCH 6/7] ci(travis): improve build speed and arm stability --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index af63bd6030..7f47068982 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ -dist: xenial +dist: focal arch: - amd64 - - arm64 + - arm64-graviton2 os: linux @@ -30,6 +30,7 @@ before_install: - echo "_APP_FUNCTIONS_RUNTIMES=php-8.0" >> .env install: +- docker-compose build --parallel - docker-compose up -d - sleep 10 From 4a48f5348b32fceaf8d4883d40eb238897af2905 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 18 Aug 2021 15:25:29 +0200 Subject: [PATCH 7/7] ci(travis): remove parallel build --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f47068982..ab378158fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,7 @@ before_install: - echo "_APP_FUNCTIONS_RUNTIMES=php-8.0" >> .env install: -- docker-compose build --parallel -- docker-compose up -d +- docker-compose up -d --build - sleep 10 script: