Skip to content

Commit f551d29

Browse files
tripolskypetrtripolskypetr
committed
docker
1 parent d18c4f4 commit f551d29

File tree

2 files changed

+75
-34
lines changed

2 files changed

+75
-34
lines changed

‎docker/.env

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ _APP_CONSOLE_WHITELIST_EMAILS=
1313
_APP_CONSOLE_WHITELIST_IPS=
1414
_APP_CONSOLE_HOSTNAMES=
1515
_APP_SYSTEM_EMAIL_NAME=Appwrite
16-
_APP_SYSTEM_EMAIL_ADDRESS=[email protected]
16+
_APP_SYSTEM_EMAIL_ADDRESS=[email protected]
17+
_APP_SYSTEM_TEAM_EMAIL=[email protected]
1718
_APP_SYSTEM_RESPONSE_FORMAT=
1819
_APP_SYSTEM_SECURITY_EMAIL_ADDRESS=[email protected]
1920
_APP_EMAIL_SECURITY=
@@ -25,6 +26,7 @@ _APP_USAGE_AGGREGATION_INTERVAL=30
2526
_APP_USAGE_TIMESERIES_INTERVAL=30
2627
_APP_USAGE_DATABASE_INTERVAL=900
2728
_APP_WORKER_PER_CORE=6
29+
_APP_CONSOLE_SESSION_ALERTS=disabled
2830
_APP_REDIS_HOST=redis
2931
_APP_REDIS_PORT=6379
3032
_APP_REDIS_USER=
@@ -73,6 +75,7 @@ _APP_STORAGE_WASABI_SECRET=
7375
_APP_STORAGE_WASABI_REGION=eu-central-1
7476
_APP_STORAGE_WASABI_BUCKET=
7577
_APP_FUNCTIONS_SIZE_LIMIT=30000000
78+
_APP_FUNCTIONS_BUILD_SIZE_LIMIT=2000000000
7679
_APP_FUNCTIONS_TIMEOUT=900
7780
_APP_FUNCTIONS_BUILD_TIMEOUT=900
7881
_APP_FUNCTIONS_CONTAINERS=10

‎docker/docker-compose.yml

+71-33
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
- appwrite
3333

3434
appwrite:
35-
image: appwrite/appwrite:1.5.10
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.10
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.10
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.10
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.10
279+
image: appwrite/appwrite:1.6.0
261280
entrypoint: worker-deletes
262281
<<: *x-logging
263282
container_name: appwrite-worker-deletes
@@ -307,13 +326,15 @@ 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
332+
- _APP_MAINTENANCE_RETENTION_ABUSE
333+
- _APP_MAINTENANCE_RETENTION_AUDIT
334+
- _APP_MAINTENANCE_RETENTION_EXECUTION
314335

315336
appwrite-worker-databases:
316-
image: appwrite/appwrite:1.5.10
337+
image: appwrite/appwrite:1.6.0
317338
entrypoint: worker-databases
318339
<<: *x-logging
319340
container_name: appwrite-worker-databases
@@ -336,11 +357,10 @@ services:
336357
- _APP_DB_SCHEMA
337358
- _APP_DB_USER
338359
- _APP_DB_PASS
339-
- _APP_LOGGING_PROVIDER
340360
- _APP_LOGGING_CONFIG
341361

342362
appwrite-worker-builds:
343-
image: appwrite/appwrite:1.5.10
363+
image: appwrite/appwrite:1.6.0
344364
entrypoint: worker-builds
345365
<<: *x-logging
346366
container_name: appwrite-worker-builds
@@ -368,7 +388,6 @@ services:
368388
- _APP_DB_SCHEMA
369389
- _APP_DB_USER
370390
- _APP_DB_PASS
371-
- _APP_LOGGING_PROVIDER
372391
- _APP_LOGGING_CONFIG
373392
- _APP_VCS_GITHUB_APP_NAME
374393
- _APP_VCS_GITHUB_PRIVATE_KEY
@@ -404,7 +423,7 @@ services:
404423
- _APP_STORAGE_WASABI_BUCKET
405424

406425
appwrite-worker-certificates:
407-
image: appwrite/appwrite:1.5.10
426+
image: appwrite/appwrite:1.6.0
408427
entrypoint: worker-certificates
409428
<<: *x-logging
410429
container_name: appwrite-worker-certificates
@@ -434,11 +453,10 @@ services:
434453
- _APP_DB_SCHEMA
435454
- _APP_DB_USER
436455
- _APP_DB_PASS
437-
- _APP_LOGGING_PROVIDER
438456
- _APP_LOGGING_CONFIG
439457

440458
appwrite-worker-functions:
441-
image: appwrite/appwrite:1.5.10
459+
image: appwrite/appwrite:1.6.0
442460
entrypoint: worker-functions
443461
<<: *x-logging
444462
container_name: appwrite-worker-functions
@@ -453,6 +471,8 @@ services:
453471
- _APP_ENV
454472
- _APP_WORKER_PER_CORE
455473
- _APP_OPENSSL_KEY_V1
474+
- _APP_DOMAIN
475+
- _APP_OPTIONS_FORCE_HTTPS
456476
- _APP_REDIS_HOST
457477
- _APP_REDIS_PORT
458478
- _APP_REDIS_USER
@@ -472,10 +492,9 @@ services:
472492
- _APP_DOCKER_HUB_USERNAME
473493
- _APP_DOCKER_HUB_PASSWORD
474494
- _APP_LOGGING_CONFIG
475-
- _APP_LOGGING_PROVIDER
476495

477496
appwrite-worker-mails:
478-
image: appwrite/appwrite:1.5.10
497+
image: appwrite/appwrite:1.6.0
479498
entrypoint: worker-mails
480499
<<: *x-logging
481500
container_name: appwrite-worker-mails
@@ -504,11 +523,10 @@ services:
504523
- _APP_SMTP_SECURE
505524
- _APP_SMTP_USERNAME
506525
- _APP_SMTP_PASSWORD
507-
- _APP_LOGGING_PROVIDER
508526
- _APP_LOGGING_CONFIG
509527

510528
appwrite-worker-messaging:
511-
image: appwrite/appwrite:1.5.10
529+
image: appwrite/appwrite:1.6.0
512530
entrypoint: worker-messaging
513531
<<: *x-logging
514532
container_name: appwrite-worker-messaging
@@ -532,7 +550,6 @@ services:
532550
- _APP_DB_SCHEMA
533551
- _APP_DB_USER
534552
- _APP_DB_PASS
535-
- _APP_LOGGING_PROVIDER
536553
- _APP_LOGGING_CONFIG
537554
- _APP_SMS_FROM
538555
- _APP_SMS_PROVIDER
@@ -559,7 +576,7 @@ services:
559576
- _APP_STORAGE_WASABI_BUCKET
560577

561578
appwrite-worker-migrations:
562-
image: appwrite/appwrite:1.5.10
579+
image: appwrite/appwrite:1.6.0
563580
entrypoint: worker-migrations
564581
<<: *x-logging
565582
container_name: appwrite-worker-migrations
@@ -584,13 +601,12 @@ services:
584601
- _APP_DB_SCHEMA
585602
- _APP_DB_USER
586603
- _APP_DB_PASS
587-
- _APP_LOGGING_PROVIDER
588604
- _APP_LOGGING_CONFIG
589605
- _APP_MIGRATIONS_FIREBASE_CLIENT_ID
590606
- _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
591607

592608
appwrite-task-maintenance:
593-
image: appwrite/appwrite:1.5.10
609+
image: appwrite/appwrite:1.6.0
594610
entrypoint: maintenance
595611
<<: *x-logging
596612
container_name: appwrite-task-maintenance
@@ -624,7 +640,7 @@ services:
624640
- _APP_MAINTENANCE_RETENTION_SCHEDULES
625641

626642
appwrite-worker-usage:
627-
image: appwrite/appwrite:1.5.10
643+
image: appwrite/appwrite:1.6.0
628644
entrypoint: worker-usage
629645
container_name: appwrite-worker-usage
630646
<<: *x-logging
@@ -648,12 +664,11 @@ services:
648664
- _APP_REDIS_USER
649665
- _APP_REDIS_PASS
650666
- _APP_USAGE_STATS
651-
- _APP_LOGGING_PROVIDER
652667
- _APP_LOGGING_CONFIG
653668
- _APP_USAGE_AGGREGATION_INTERVAL
654669

655670
appwrite-worker-usage-dump:
656-
image: appwrite/appwrite:1.5.10
671+
image: appwrite/appwrite:1.6.0
657672
entrypoint: worker-usage-dump
658673
<<: *x-logging
659674
container_name: appwrite-worker-usage-dump
@@ -676,12 +691,11 @@ services:
676691
- _APP_REDIS_USER
677692
- _APP_REDIS_PASS
678693
- _APP_USAGE_STATS
679-
- _APP_LOGGING_PROVIDER
680694
- _APP_LOGGING_CONFIG
681695
- _APP_USAGE_AGGREGATION_INTERVAL
682696

683697
appwrite-task-scheduler-functions:
684-
image: appwrite/appwrite:1.5.10
698+
image: appwrite/appwrite:1.6.0
685699
entrypoint: schedule-functions
686700
container_name: appwrite-task-scheduler-functions
687701
<<: *x-logging
@@ -705,8 +719,33 @@ services:
705719
- _APP_DB_USER
706720
- _APP_DB_PASS
707721

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+
708747
appwrite-task-scheduler-messages:
709-
image: appwrite/appwrite:1.5.10
748+
image: appwrite/appwrite:1.6.0
710749
entrypoint: schedule-messages
711750
container_name: appwrite-task-scheduler-messages
712751
<<: *x-logging
@@ -746,7 +785,7 @@ services:
746785
<<: *x-logging
747786
restart: unless-stopped
748787
stop_signal: SIGINT
749-
image: openruntimes/executor:0.5.7
788+
image: openruntimes/executor:0.6.11
750789
networks:
751790
- appwrite
752791
- runtimes
@@ -766,7 +805,6 @@ services:
766805
- OPR_EXECUTOR_ENV=$_APP_ENV
767806
- OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
768807
- OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
769-
- OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
770808
- OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
771809
- OPR_EXECUTOR_STORAGE_DEVICE=$_APP_STORAGE_DEVICE
772810
- OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY=$_APP_STORAGE_S3_ACCESS_KEY

0 commit comments

Comments
 (0)