Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99d4fa44b8 | ||
|
|
a4d1e52762 |
+13
-14
@@ -70,7 +70,7 @@ x-common-env: &common-env
|
|||||||
Y_PROVIDER_API_BASE_URL: http://y-provider:4444/api/
|
Y_PROVIDER_API_BASE_URL: http://y-provider:4444/api/
|
||||||
Y_PROVIDER_API_KEY_FILE: /run/secrets/y_api_key
|
Y_PROVIDER_API_KEY_FILE: /run/secrets/y_api_key
|
||||||
# DocSpec — converts .docx → BlockNote JSON, then y-provider turns that into Yjs
|
# DocSpec — converts .docx → BlockNote JSON, then y-provider turns that into Yjs
|
||||||
DOCSPEC_API_URL: http://docspec:4000/conversion
|
DOCSPEC_API_URL: http://docspec:3000/conversion
|
||||||
# Database connection pool
|
# Database connection pool
|
||||||
DB_PSYCOPG_POOL_ENABLED:
|
DB_PSYCOPG_POOL_ENABLED:
|
||||||
# Media auth header (matches recipe nginx by default)
|
# Media auth header (matches recipe nginx by default)
|
||||||
@@ -103,7 +103,7 @@ x-minio-env: &minio-env
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: lasuite/impress-frontend:v5.6.1
|
image: lasuite/impress-frontend:v5.7.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
deploy:
|
deploy:
|
||||||
@@ -120,7 +120,7 @@ services:
|
|||||||
start_period: 10s
|
start_period: 10s
|
||||||
|
|
||||||
backend:
|
backend:
|
||||||
image: lasuite/impress-backend:v5.6.1
|
image: lasuite/impress-backend:v5.7.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
environment:
|
environment:
|
||||||
@@ -155,7 +155,7 @@ services:
|
|||||||
- email_pass
|
- email_pass
|
||||||
|
|
||||||
celery:
|
celery:
|
||||||
image: lasuite/impress-backend:v5.6.1
|
image: lasuite/impress-backend:v5.7.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
healthcheck:
|
healthcheck:
|
||||||
@@ -185,7 +185,7 @@ services:
|
|||||||
|
|
||||||
|
|
||||||
y-provider:
|
y-provider:
|
||||||
image: lasuite/impress-y-provider:v5.6.1
|
image: lasuite/impress-y-provider:v5.7.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
healthcheck:
|
healthcheck:
|
||||||
@@ -204,12 +204,12 @@ services:
|
|||||||
- y_api_key
|
- y_api_key
|
||||||
|
|
||||||
docspec:
|
docspec:
|
||||||
image: ghcr.io/docspecio/api:3.0.2
|
image: ghcr.io/docspec/api:1.21.4
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
healthcheck:
|
healthcheck:
|
||||||
# Use 127.0.0.1, which is required instead of localhost for this healtcheck because of elixir/busybox bindings
|
# Use 127.0.0.1, which is required instead of localhost for this healtcheck because of elixir/busybox bindings
|
||||||
test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://127.0.0.1:4000/health"]
|
test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://127.0.0.1:3000/health"]
|
||||||
interval: 15s
|
interval: 15s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 3
|
retries: 3
|
||||||
@@ -243,7 +243,7 @@ services:
|
|||||||
- postgres_p
|
- postgres_p
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:8.10.1
|
image: redis:8.10.2
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "redis-cli", "ping"]
|
test: ["CMD", "redis-cli", "ping"]
|
||||||
interval: 15s
|
interval: 15s
|
||||||
@@ -253,8 +253,7 @@ services:
|
|||||||
- backend
|
- backend
|
||||||
|
|
||||||
minio:
|
minio:
|
||||||
image: bitnamilegacy/minio:2025.7.23-debian-12-r5
|
image: quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z
|
||||||
user: root
|
|
||||||
environment: *minio-env
|
environment: *minio-env
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "mc", "ready", "local"]
|
test: ["CMD", "mc", "ready", "local"]
|
||||||
@@ -263,11 +262,11 @@ services:
|
|||||||
retries: 300
|
retries: 300
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
command: /opt/bitnami/scripts/minio/run.sh
|
command: minio server /data
|
||||||
entrypoint: >
|
entrypoint: >
|
||||||
sh -c "/minio-initialize.sh & exec /opt/bitnami/scripts/minio/entrypoint.sh \"$$@\"" --
|
sh -c "/minio-initialize.sh & exec /usr/bin/docker-entrypoint.sh \"$$@\"" --
|
||||||
volumes:
|
volumes:
|
||||||
- minio:/bitnami/minio/data
|
- minio:/data
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
backupbot.backup: "${ENABLE_BACKUPS:-true}"
|
backupbot.backup: "${ENABLE_BACKUPS:-true}"
|
||||||
@@ -284,7 +283,7 @@ services:
|
|||||||
- minio_ru
|
- minio_ru
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: nginx:1.31.5
|
image: nginx:1.31.6
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8083"]
|
test: ["CMD", "curl", "-f", "http://localhost:8083"]
|
||||||
interval: 15s
|
interval: 15s
|
||||||
|
|||||||
@@ -1,11 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Use an isolated mc config dir: the bundled Bitnami image runs its own
|
|
||||||
# internal mc client (as the "minio" user) against the default /.mc path,
|
|
||||||
# which collides with this script running as root against the same path.
|
|
||||||
export MC_CONFIG_DIR=/tmp/mc-docs-init
|
|
||||||
|
|
||||||
# Wait for minio to be ready (up to 60 seconds)
|
# Wait for minio to be ready (up to 60 seconds)
|
||||||
i=0
|
i=0
|
||||||
while ! mc ready local 2>/dev/null; do
|
while ! mc ready local 2>/dev/null; do
|
||||||
|
|||||||
Reference in New Issue
Block a user