Skip to content

Commit c7700ac

Browse files
authored
chore(docker): bump version (#25092)
Signed-off-by: -LAN- <laipz8200@outlook.com>
1 parent d011ddf commit c7700ac

File tree

2 files changed

+140
-74
lines changed

2 files changed

+140
-74
lines changed

docker/docker-compose-template.yaml

Lines changed: 70 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
# worker service
3232
# The Celery worker for processing the queue.
3333
worker:
34-
image: langgenius/dify-api:1.8.0
34+
image: langgenius/dify-api:1.8.1
3535
restart: always
3636
environment:
3737
# Use the shared environment variables.
@@ -58,7 +58,7 @@ services:
5858
# worker_beat service
5959
# Celery beat for scheduling periodic tasks.
6060
worker_beat:
61-
image: langgenius/dify-api:1.8.0
61+
image: langgenius/dify-api:1.8.1
6262
restart: always
6363
environment:
6464
# Use the shared environment variables.
@@ -76,7 +76,7 @@ services:
7676

7777
# Frontend web application.
7878
web:
79-
image: langgenius/dify-web:1.8.0
79+
image: langgenius/dify-web:1.8.1
8080
restart: always
8181
environment:
8282
CONSOLE_API_URL: ${CONSOLE_API_URL:-}
@@ -118,7 +118,17 @@ services:
118118
volumes:
119119
- ./volumes/db/data:/var/lib/postgresql/data
120120
healthcheck:
121-
test: [ 'CMD', 'pg_isready', '-h', 'db', '-U', '${PGUSER:-postgres}', '-d', '${POSTGRES_DB:-dify}' ]
121+
test:
122+
[
123+
"CMD",
124+
"pg_isready",
125+
"-h",
126+
"db",
127+
"-U",
128+
"${PGUSER:-postgres}",
129+
"-d",
130+
"${POSTGRES_DB:-dify}",
131+
]
122132
interval: 1s
123133
timeout: 3s
124134
retries: 60
@@ -135,7 +145,11 @@ services:
135145
# Set the redis password when startup redis server.
136146
command: redis-server --requirepass ${REDIS_PASSWORD:-difyai123456}
137147
healthcheck:
138-
test: [ 'CMD-SHELL', 'redis-cli -a ${REDIS_PASSWORD:-difyai123456} ping | grep -q PONG' ]
148+
test:
149+
[
150+
"CMD-SHELL",
151+
"redis-cli -a ${REDIS_PASSWORD:-difyai123456} ping | grep -q PONG",
152+
]
139153

140154
# The DifySandbox
141155
sandbox:
@@ -157,7 +171,7 @@ services:
157171
- ./volumes/sandbox/dependencies:/dependencies
158172
- ./volumes/sandbox/conf:/conf
159173
healthcheck:
160-
test: [ 'CMD', 'curl', '-f', 'http://localhost:8194/health' ]
174+
test: ["CMD", "curl", "-f", "http://localhost:8194/health"]
161175
networks:
162176
- ssrf_proxy_network
163177

@@ -231,7 +245,12 @@ services:
231245
volumes:
232246
- ./ssrf_proxy/squid.conf.template:/etc/squid/squid.conf.template
233247
- ./ssrf_proxy/docker-entrypoint.sh:/docker-entrypoint-mount.sh
234-
entrypoint: [ 'sh', '-c', "cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh" ]
248+
entrypoint:
249+
[
250+
"sh",
251+
"-c",
252+
"cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh",
253+
]
235254
environment:
236255
# pls clearly modify the squid env vars to fit your network environment.
237256
HTTP_PORT: ${SSRF_HTTP_PORT:-3128}
@@ -260,8 +279,8 @@ services:
260279
- CERTBOT_EMAIL=${CERTBOT_EMAIL}
261280
- CERTBOT_DOMAIN=${CERTBOT_DOMAIN}
262281
- CERTBOT_OPTIONS=${CERTBOT_OPTIONS:-}
263-
entrypoint: [ '/docker-entrypoint.sh' ]
264-
command: [ 'tail', '-f', '/dev/null' ]
282+
entrypoint: ["/docker-entrypoint.sh"]
283+
command: ["tail", "-f", "/dev/null"]
265284

266285
# The nginx reverse proxy.
267286
# used for reverse proxying the API service and Web service.
@@ -278,7 +297,12 @@ services:
278297
- ./volumes/certbot/conf/live:/etc/letsencrypt/live # cert dir (with certbot container)
279298
- ./volumes/certbot/conf:/etc/letsencrypt
280299
- ./volumes/certbot/www:/var/www/html
281-
entrypoint: [ 'sh', '-c', "cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh" ]
300+
entrypoint:
301+
[
302+
"sh",
303+
"-c",
304+
"cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh",
305+
]
282306
environment:
283307
NGINX_SERVER_NAME: ${NGINX_SERVER_NAME:-_}
284308
NGINX_HTTPS_ENABLED: ${NGINX_HTTPS_ENABLED:-false}
@@ -300,14 +324,14 @@ services:
300324
- api
301325
- web
302326
ports:
303-
- '${EXPOSE_NGINX_PORT:-80}:${NGINX_PORT:-80}'
304-
- '${EXPOSE_NGINX_SSL_PORT:-443}:${NGINX_SSL_PORT:-443}'
327+
- "${EXPOSE_NGINX_PORT:-80}:${NGINX_PORT:-80}"
328+
- "${EXPOSE_NGINX_SSL_PORT:-443}:${NGINX_SSL_PORT:-443}"
305329

306330
# The Weaviate vector store.
307331
weaviate:
308332
image: semitechnologies/weaviate:1.19.0
309333
profiles:
310-
- ''
334+
- ""
311335
- weaviate
312336
restart: always
313337
volumes:
@@ -360,13 +384,17 @@ services:
360384
working_dir: /opt/couchbase
361385
stdin_open: true
362386
tty: true
363-
entrypoint: [ "" ]
387+
entrypoint: [""]
364388
command: sh -c "/opt/couchbase/init/init-cbserver.sh"
365389
volumes:
366390
- ./volumes/couchbase/data:/opt/couchbase/var/lib/couchbase/data
367391
healthcheck:
368392
# ensure bucket was created before proceeding
369-
test: [ "CMD-SHELL", "curl -s -f -u Administrator:password http://localhost:8091/pools/default/buckets | grep -q '\\[{' || exit 1" ]
393+
test:
394+
[
395+
"CMD-SHELL",
396+
"curl -s -f -u Administrator:password http://localhost:8091/pools/default/buckets | grep -q '\\[{' || exit 1",
397+
]
370398
interval: 10s
371399
retries: 10
372400
start_period: 30s
@@ -392,9 +420,9 @@ services:
392420
volumes:
393421
- ./volumes/pgvector/data:/var/lib/postgresql/data
394422
- ./pgvector/docker-entrypoint.sh:/docker-entrypoint.sh
395-
entrypoint: [ '/docker-entrypoint.sh' ]
423+
entrypoint: ["/docker-entrypoint.sh"]
396424
healthcheck:
397-
test: [ 'CMD', 'pg_isready' ]
425+
test: ["CMD", "pg_isready"]
398426
interval: 1s
399427
timeout: 3s
400428
retries: 30
@@ -411,14 +439,14 @@ services:
411439
- VB_USERNAME=dify
412440
- VB_PASSWORD=Difyai123456
413441
ports:
414-
- '5434:5432'
442+
- "5434:5432"
415443
volumes:
416444
- ./vastbase/lic:/home/vastbase/vastbase/lic
417445
- ./vastbase/data:/home/vastbase/data
418446
- ./vastbase/backup:/home/vastbase/backup
419447
- ./vastbase/backup_log:/home/vastbase/backup_log
420448
healthcheck:
421-
test: [ 'CMD', 'pg_isready' ]
449+
test: ["CMD", "pg_isready"]
422450
interval: 1s
423451
timeout: 3s
424452
retries: 30
@@ -440,7 +468,7 @@ services:
440468
volumes:
441469
- ./volumes/pgvecto_rs/data:/var/lib/postgresql/data
442470
healthcheck:
443-
test: [ 'CMD', 'pg_isready' ]
471+
test: ["CMD", "pg_isready"]
444472
interval: 1s
445473
timeout: 3s
446474
retries: 30
@@ -479,7 +507,11 @@ services:
479507
ports:
480508
- "${OCEANBASE_VECTOR_PORT:-2881}:2881"
481509
healthcheck:
482-
test: [ 'CMD-SHELL', 'obclient -h127.0.0.1 -P2881 -uroot@test -p$${OB_TENANT_PASSWORD} -e "SELECT 1;"' ]
510+
test:
511+
[
512+
"CMD-SHELL",
513+
'obclient -h127.0.0.1 -P2881 -uroot@test -p$${OB_TENANT_PASSWORD} -e "SELECT 1;"',
514+
]
483515
interval: 10s
484516
retries: 30
485517
start_period: 30s
@@ -515,7 +547,7 @@ services:
515547
- ./volumes/milvus/etcd:/etcd
516548
command: etcd -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379 --data-dir /etcd
517549
healthcheck:
518-
test: [ 'CMD', 'etcdctl', 'endpoint', 'health' ]
550+
test: ["CMD", "etcdctl", "endpoint", "health"]
519551
interval: 30s
520552
timeout: 20s
521553
retries: 3
@@ -534,7 +566,7 @@ services:
534566
- ./volumes/milvus/minio:/minio_data
535567
command: minio server /minio_data --console-address ":9001"
536568
healthcheck:
537-
test: [ 'CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live' ]
569+
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
538570
interval: 30s
539571
timeout: 20s
540572
retries: 3
@@ -546,15 +578,15 @@ services:
546578
image: milvusdb/milvus:v2.5.15
547579
profiles:
548580
- milvus
549-
command: [ 'milvus', 'run', 'standalone' ]
581+
command: ["milvus", "run", "standalone"]
550582
environment:
551583
ETCD_ENDPOINTS: ${ETCD_ENDPOINTS:-etcd:2379}
552584
MINIO_ADDRESS: ${MINIO_ADDRESS:-minio:9000}
553585
common.security.authorizationEnabled: ${MILVUS_AUTHORIZATION_ENABLED:-true}
554586
volumes:
555587
- ./volumes/milvus/milvus:/var/lib/milvus
556588
healthcheck:
557-
test: [ 'CMD', 'curl', '-f', 'http://localhost:9091/healthz' ]
589+
test: ["CMD", "curl", "-f", "http://localhost:9091/healthz"]
558590
interval: 30s
559591
start_period: 90s
560592
timeout: 20s
@@ -620,7 +652,7 @@ services:
620652
volumes:
621653
- ./volumes/opengauss/data:/var/lib/opengauss/data
622654
healthcheck:
623-
test: [ "CMD-SHELL", "netstat -lntp | grep tcp6 > /dev/null 2>&1" ]
655+
test: ["CMD-SHELL", "netstat -lntp | grep tcp6 > /dev/null 2>&1"]
624656
interval: 10s
625657
timeout: 10s
626658
retries: 10
@@ -673,18 +705,19 @@ services:
673705
node.name: dify-es0
674706
discovery.type: single-node
675707
xpack.license.self_generated.type: basic
676-
xpack.security.enabled: 'true'
677-
xpack.security.enrollment.enabled: 'false'
678-
xpack.security.http.ssl.enabled: 'false'
708+
xpack.security.enabled: "true"
709+
xpack.security.enrollment.enabled: "false"
710+
xpack.security.http.ssl.enabled: "false"
679711
ports:
680712
- ${ELASTICSEARCH_PORT:-9200}:9200
681713
deploy:
682714
resources:
683715
limits:
684716
memory: 2g
685-
entrypoint: [ 'sh', '-c', "sh /docker-entrypoint-mount.sh" ]
717+
entrypoint: ["sh", "-c", "sh /docker-entrypoint-mount.sh"]
686718
healthcheck:
687-
test: [ 'CMD', 'curl', '-s', 'http://localhost:9200/_cluster/health?pretty' ]
719+
test:
720+
["CMD", "curl", "-s", "http://localhost:9200/_cluster/health?pretty"]
688721
interval: 30s
689722
timeout: 10s
690723
retries: 50
@@ -702,17 +735,17 @@ services:
702735
environment:
703736
XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY: d1a66dfd-c4d3-4a0a-8290-2abcb83ab3aa
704737
NO_PROXY: localhost,127.0.0.1,elasticsearch,kibana
705-
XPACK_SECURITY_ENABLED: 'true'
706-
XPACK_SECURITY_ENROLLMENT_ENABLED: 'false'
707-
XPACK_SECURITY_HTTP_SSL_ENABLED: 'false'
708-
XPACK_FLEET_ISAIRGAPPED: 'true'
738+
XPACK_SECURITY_ENABLED: "true"
739+
XPACK_SECURITY_ENROLLMENT_ENABLED: "false"
740+
XPACK_SECURITY_HTTP_SSL_ENABLED: "false"
741+
XPACK_FLEET_ISAIRGAPPED: "true"
709742
I18N_LOCALE: zh-CN
710-
SERVER_PORT: '5601'
743+
SERVER_PORT: "5601"
711744
ELASTICSEARCH_HOSTS: http://elasticsearch:9200
712745
ports:
713746
- ${KIBANA_PORT:-5601}:5601
714747
healthcheck:
715-
test: [ 'CMD-SHELL', 'curl -s http://localhost:5601 >/dev/null || exit 1' ]
748+
test: ["CMD-SHELL", "curl -s http://localhost:5601 >/dev/null || exit 1"]
716749
interval: 30s
717750
timeout: 10s
718751
retries: 3

0 commit comments

Comments
 (0)