Skip to content

Commit 2ccad72

Browse files
authored
Merge pull request #36 from appwrite/feat-1.6.0
feat: update to 1.6.0 release
2 parents 602d158 + 2fe557a commit 2ccad72

File tree

2 files changed

+71
-33
lines changed

2 files changed

+71
-33
lines changed

.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ _APP_SETUP=1-click-gitpod
1515
_APP_CONSOLE_HOSTNAMES=
1616
_APP_SYSTEM_EMAIL_NAME=Appwrite
1717
_APP_SYSTEM_EMAIL_ADDRESS=[email protected]
18+
_APP_SYSTEM_TEAM_EMAIL=[email protected]
1819
_APP_SYSTEM_RESPONSE_FORMAT=
1920
_APP_SYSTEM_SECURITY_EMAIL_ADDRESS=[email protected]
2021
_APP_EMAIL_SECURITY=
@@ -26,6 +27,7 @@ _APP_USAGE_AGGREGATION_INTERVAL=30
2627
_APP_USAGE_TIMESERIES_INTERVAL=30
2728
_APP_USAGE_DATABASE_INTERVAL=900
2829
_APP_WORKER_PER_CORE=6
30+
_APP_CONSOLE_SESSION_ALERTS=disabled
2931
_APP_REDIS_HOST=redis
3032
_APP_REDIS_PORT=6379
3133
_APP_REDIS_USER=
@@ -74,6 +76,7 @@ _APP_STORAGE_WASABI_SECRET=
7476
_APP_STORAGE_WASABI_REGION=eu-central-1
7577
_APP_STORAGE_WASABI_BUCKET=
7678
_APP_FUNCTIONS_SIZE_LIMIT=30000000
79+
_APP_FUNCTIONS_BUILD_SIZE_LIMIT=2000000000
7780
_APP_FUNCTIONS_TIMEOUT=900
7881
_APP_FUNCTIONS_BUILD_TIMEOUT=900
7982
_APP_FUNCTIONS_CONTAINERS=10

docker-compose.yml

Lines changed: 68 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
- appwrite
3333

3434
appwrite:
35-
image: appwrite/appwrite:1.5.11
35+
image: appwrite/appwrite:1.6.0
3636
container_name: appwrite
3737
<<: *x-logging
3838
restart: unless-stopped
@@ -68,6 +68,7 @@ services:
6868
- _APP_LOCALE
6969
- _APP_CONSOLE_WHITELIST_ROOT
7070
- _APP_CONSOLE_WHITELIST_EMAILS
71+
- _APP_CONSOLE_SESSION_ALERTS
7172
- _APP_CONSOLE_WHITELIST_IPS
7273
- _APP_CONSOLE_HOSTNAMES
7374
- _APP_SYSTEM_EMAIL_NAME
@@ -131,7 +132,6 @@ services:
131132
- _APP_FUNCTIONS_RUNTIMES
132133
- _APP_EXECUTOR_SECRET
133134
- _APP_EXECUTOR_HOST
134-
- _APP_LOGGING_PROVIDER
135135
- _APP_LOGGING_CONFIG
136136
- _APP_MAINTENANCE_INTERVAL
137137
- _APP_MAINTENANCE_DELAY
@@ -156,8 +156,30 @@ services:
156156
- _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
157157
- _APP_ASSISTANT_OPENAI_API_KEY
158158

159+
appwrite-console:
160+
<<: *x-logging
161+
container_name: appwrite-console
162+
image: appwrite/console:5.0.12
163+
restart: unless-stopped
164+
networks:
165+
- appwrite
166+
labels:
167+
- "traefik.enable=true"
168+
- "traefik.constraint-label-stack=appwrite"
169+
- "traefik.docker.network=appwrite"
170+
- "traefik.http.services.appwrite_console.loadbalancer.server.port=80"
171+
#ws
172+
- traefik.http.routers.appwrite_console_http.entrypoints=appwrite_web
173+
- traefik.http.routers.appwrite_console_http.rule=PathPrefix(`/console`)
174+
- traefik.http.routers.appwrite_console_http.service=appwrite_console
175+
# wss
176+
- traefik.http.routers.appwrite_console_https.entrypoints=appwrite_websecure
177+
- traefik.http.routers.appwrite_console_https.rule=PathPrefix(`/console`)
178+
- traefik.http.routers.appwrite_console_https.service=appwrite_console
179+
- traefik.http.routers.appwrite_console_https.tls=true
180+
159181
appwrite-realtime:
160-
image: appwrite/appwrite:1.5.11
182+
image: appwrite/appwrite:1.6.0
161183
entrypoint: realtime
162184
container_name: appwrite-realtime
163185
<<: *x-logging
@@ -197,11 +219,10 @@ services:
197219
- _APP_DB_USER
198220
- _APP_DB_PASS
199221
- _APP_USAGE_STATS
200-
- _APP_LOGGING_PROVIDER
201222
- _APP_LOGGING_CONFIG
202223

203224
appwrite-worker-audits:
204-
image: appwrite/appwrite:1.5.11
225+
image: appwrite/appwrite:1.6.0
205226
entrypoint: worker-audits
206227
<<: *x-logging
207228
container_name: appwrite-worker-audits
@@ -224,11 +245,10 @@ services:
224245
- _APP_DB_SCHEMA
225246
- _APP_DB_USER
226247
- _APP_DB_PASS
227-
- _APP_LOGGING_PROVIDER
228248
- _APP_LOGGING_CONFIG
229249

230250
appwrite-worker-webhooks:
231-
image: appwrite/appwrite:1.5.11
251+
image: appwrite/appwrite:1.6.0
232252
entrypoint: worker-webhooks
233253
<<: *x-logging
234254
container_name: appwrite-worker-webhooks
@@ -253,11 +273,10 @@ services:
253273
- _APP_REDIS_PORT
254274
- _APP_REDIS_USER
255275
- _APP_REDIS_PASS
256-
- _APP_LOGGING_PROVIDER
257276
- _APP_LOGGING_CONFIG
258277

259278
appwrite-worker-deletes:
260-
image: appwrite/appwrite:1.5.11
279+
image: appwrite/appwrite:1.6.0
261280
entrypoint: worker-deletes
262281
<<: *x-logging
263282
container_name: appwrite-worker-deletes
@@ -307,7 +326,6 @@ services:
307326
- _APP_STORAGE_WASABI_SECRET
308327
- _APP_STORAGE_WASABI_REGION
309328
- _APP_STORAGE_WASABI_BUCKET
310-
- _APP_LOGGING_PROVIDER
311329
- _APP_LOGGING_CONFIG
312330
- _APP_EXECUTOR_SECRET
313331
- _APP_EXECUTOR_HOST
@@ -316,7 +334,7 @@ services:
316334
- _APP_MAINTENANCE_RETENTION_EXECUTION
317335

318336
appwrite-worker-databases:
319-
image: appwrite/appwrite:1.5.11
337+
image: appwrite/appwrite:1.6.0
320338
entrypoint: worker-databases
321339
<<: *x-logging
322340
container_name: appwrite-worker-databases
@@ -339,11 +357,10 @@ services:
339357
- _APP_DB_SCHEMA
340358
- _APP_DB_USER
341359
- _APP_DB_PASS
342-
- _APP_LOGGING_PROVIDER
343360
- _APP_LOGGING_CONFIG
344361

345362
appwrite-worker-builds:
346-
image: appwrite/appwrite:1.5.11
363+
image: appwrite/appwrite:1.6.0
347364
entrypoint: worker-builds
348365
<<: *x-logging
349366
container_name: appwrite-worker-builds
@@ -371,7 +388,6 @@ services:
371388
- _APP_DB_SCHEMA
372389
- _APP_DB_USER
373390
- _APP_DB_PASS
374-
- _APP_LOGGING_PROVIDER
375391
- _APP_LOGGING_CONFIG
376392
- _APP_VCS_GITHUB_APP_NAME
377393
- _APP_VCS_GITHUB_PRIVATE_KEY
@@ -407,7 +423,7 @@ services:
407423
- _APP_STORAGE_WASABI_BUCKET
408424

409425
appwrite-worker-certificates:
410-
image: appwrite/appwrite:1.5.11
426+
image: appwrite/appwrite:1.6.0
411427
entrypoint: worker-certificates
412428
<<: *x-logging
413429
container_name: appwrite-worker-certificates
@@ -437,11 +453,10 @@ services:
437453
- _APP_DB_SCHEMA
438454
- _APP_DB_USER
439455
- _APP_DB_PASS
440-
- _APP_LOGGING_PROVIDER
441456
- _APP_LOGGING_CONFIG
442457

443458
appwrite-worker-functions:
444-
image: appwrite/appwrite:1.5.11
459+
image: appwrite/appwrite:1.6.0
445460
entrypoint: worker-functions
446461
<<: *x-logging
447462
container_name: appwrite-worker-functions
@@ -456,6 +471,8 @@ services:
456471
- _APP_ENV
457472
- _APP_WORKER_PER_CORE
458473
- _APP_OPENSSL_KEY_V1
474+
- _APP_DOMAIN
475+
- _APP_OPTIONS_FORCE_HTTPS
459476
- _APP_REDIS_HOST
460477
- _APP_REDIS_PORT
461478
- _APP_REDIS_USER
@@ -475,10 +492,9 @@ services:
475492
- _APP_DOCKER_HUB_USERNAME
476493
- _APP_DOCKER_HUB_PASSWORD
477494
- _APP_LOGGING_CONFIG
478-
- _APP_LOGGING_PROVIDER
479495

480496
appwrite-worker-mails:
481-
image: appwrite/appwrite:1.5.11
497+
image: appwrite/appwrite:1.6.0
482498
entrypoint: worker-mails
483499
<<: *x-logging
484500
container_name: appwrite-worker-mails
@@ -507,11 +523,10 @@ services:
507523
- _APP_SMTP_SECURE
508524
- _APP_SMTP_USERNAME
509525
- _APP_SMTP_PASSWORD
510-
- _APP_LOGGING_PROVIDER
511526
- _APP_LOGGING_CONFIG
512527

513528
appwrite-worker-messaging:
514-
image: appwrite/appwrite:1.5.11
529+
image: appwrite/appwrite:1.6.0
515530
entrypoint: worker-messaging
516531
<<: *x-logging
517532
container_name: appwrite-worker-messaging
@@ -535,7 +550,6 @@ services:
535550
- _APP_DB_SCHEMA
536551
- _APP_DB_USER
537552
- _APP_DB_PASS
538-
- _APP_LOGGING_PROVIDER
539553
- _APP_LOGGING_CONFIG
540554
- _APP_SMS_FROM
541555
- _APP_SMS_PROVIDER
@@ -562,7 +576,7 @@ services:
562576
- _APP_STORAGE_WASABI_BUCKET
563577

564578
appwrite-worker-migrations:
565-
image: appwrite/appwrite:1.5.11
579+
image: appwrite/appwrite:1.6.0
566580
entrypoint: worker-migrations
567581
<<: *x-logging
568582
container_name: appwrite-worker-migrations
@@ -587,13 +601,12 @@ services:
587601
- _APP_DB_SCHEMA
588602
- _APP_DB_USER
589603
- _APP_DB_PASS
590-
- _APP_LOGGING_PROVIDER
591604
- _APP_LOGGING_CONFIG
592605
- _APP_MIGRATIONS_FIREBASE_CLIENT_ID
593606
- _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
594607

595608
appwrite-task-maintenance:
596-
image: appwrite/appwrite:1.5.11
609+
image: appwrite/appwrite:1.6.0
597610
entrypoint: maintenance
598611
<<: *x-logging
599612
container_name: appwrite-task-maintenance
@@ -627,7 +640,7 @@ services:
627640
- _APP_MAINTENANCE_RETENTION_SCHEDULES
628641

629642
appwrite-worker-usage:
630-
image: appwrite/appwrite:1.5.11
643+
image: appwrite/appwrite:1.6.0
631644
entrypoint: worker-usage
632645
container_name: appwrite-worker-usage
633646
<<: *x-logging
@@ -651,12 +664,11 @@ services:
651664
- _APP_REDIS_USER
652665
- _APP_REDIS_PASS
653666
- _APP_USAGE_STATS
654-
- _APP_LOGGING_PROVIDER
655667
- _APP_LOGGING_CONFIG
656668
- _APP_USAGE_AGGREGATION_INTERVAL
657669

658670
appwrite-worker-usage-dump:
659-
image: appwrite/appwrite:1.5.11
671+
image: appwrite/appwrite:1.6.0
660672
entrypoint: worker-usage-dump
661673
<<: *x-logging
662674
container_name: appwrite-worker-usage-dump
@@ -679,12 +691,11 @@ services:
679691
- _APP_REDIS_USER
680692
- _APP_REDIS_PASS
681693
- _APP_USAGE_STATS
682-
- _APP_LOGGING_PROVIDER
683694
- _APP_LOGGING_CONFIG
684695
- _APP_USAGE_AGGREGATION_INTERVAL
685696

686697
appwrite-task-scheduler-functions:
687-
image: appwrite/appwrite:1.5.11
698+
image: appwrite/appwrite:1.6.0
688699
entrypoint: schedule-functions
689700
container_name: appwrite-task-scheduler-functions
690701
<<: *x-logging
@@ -708,8 +719,33 @@ services:
708719
- _APP_DB_USER
709720
- _APP_DB_PASS
710721

722+
appwrite-task-scheduler-executions:
723+
image: appwrite/appwrite:1.6.0
724+
entrypoint: schedule-executions
725+
container_name: appwrite-task-scheduler-executions
726+
<<: *x-logging
727+
restart: unless-stopped
728+
networks:
729+
- appwrite
730+
depends_on:
731+
- mariadb
732+
- redis
733+
environment:
734+
- _APP_ENV
735+
- _APP_WORKER_PER_CORE
736+
- _APP_OPENSSL_KEY_V1
737+
- _APP_REDIS_HOST
738+
- _APP_REDIS_PORT
739+
- _APP_REDIS_USER
740+
- _APP_REDIS_PASS
741+
- _APP_DB_HOST
742+
- _APP_DB_PORT
743+
- _APP_DB_SCHEMA
744+
- _APP_DB_USER
745+
- _APP_DB_PASS
746+
711747
appwrite-task-scheduler-messages:
712-
image: appwrite/appwrite:1.5.11
748+
image: appwrite/appwrite:1.6.0
713749
entrypoint: schedule-messages
714750
container_name: appwrite-task-scheduler-messages
715751
<<: *x-logging
@@ -749,7 +785,7 @@ services:
749785
<<: *x-logging
750786
restart: unless-stopped
751787
stop_signal: SIGINT
752-
image: openruntimes/executor:0.5.10
788+
image: openruntimes/executor:0.6.11
753789
networks:
754790
- appwrite
755791
- runtimes
@@ -769,7 +805,6 @@ services:
769805
- OPR_EXECUTOR_ENV=$_APP_ENV
770806
- OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
771807
- OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
772-
- OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
773808
- OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
774809
- OPR_EXECUTOR_STORAGE_DEVICE=$_APP_STORAGE_DEVICE
775810
- OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY=$_APP_STORAGE_S3_ACCESS_KEY

0 commit comments

Comments
 (0)