fix(up+wip): deps + amqp + valkey + kvrocks
All checks were successful
/ build (map[dockerfile:./services/app/Dockerfile name:app]) (push) Successful in 2m5s
/ build (map[dockerfile:./services/files/Dockerfile name:files]) (push) Successful in 3m4s
/ build (map[dockerfile:./services/web/Dockerfile name:web]) (push) Successful in 2m52s
/ deploy (push) Successful in 46s
/ build (map[dockerfile:./services/api/Dockerfile name:api]) (push) Successful in 3m16s
/ build (map[dockerfile:./services/hasura/Dockerfile name:hasura]) (push) Successful in 2m33s
/ build (map[dockerfile:./services/watchers/Dockerfile name:watchers]) (push) Successful in 2m49s
/ build (map[dockerfile:./services/tasks/Dockerfile name:tasks]) (push) Successful in 2m58s

This commit is contained in:
devthejo 2025-10-23 11:49:43 +02:00
parent 7b4c96b7c3
commit 4198dc3ad9
No known key found for this signature in database
GPG key ID: 00CCA7A92B1D5351
7 changed files with 1150 additions and 1090 deletions

942
.yarn/releases/yarn-4.10.3.cjs vendored Executable file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -9,4 +9,4 @@ plugins:
path: .yarn/plugins/@yarnpkg/plugin-fetch.cjs path: .yarn/plugins/@yarnpkg/plugin-fetch.cjs
spec: "https://codeberg.org/devthefuture/yarn-plugin-fetch/raw/branch/master/bundles/@yarnpkg/plugin-fetch.js" spec: "https://codeberg.org/devthefuture/yarn-plugin-fetch/raw/branch/master/bundles/@yarnpkg/plugin-fetch.js"
yarnPath: .yarn/releases/yarn-4.6.0.cjs yarnPath: .yarn/releases/yarn-4.10.3.cjs

View file

@ -1,67 +1,73 @@
services: services:
db: db:
image: mdillon/postgis:11 image: mdillon/postgis:11
restart: always
environment: environment:
- POSTGRES_USER=dev - POSTGRES_USER=dev
- POSTGRES_PASSWORD=dev - POSTGRES_PASSWORD=dev
ports: ports:
- "${EXPOSE_PG_PORT:-4204}:5432" - "${EXPOSE_PG_PORT:-4204}:5432"
volumes: volumes:
- pgdata:/var/lib/postgresql/data - pg_data:/var/lib/postgresql/data
restart: always
minio: minio:
image: bitnami/minio:2022-debian-10 image: minio/minio:RELEASE.2025-09-07T16-13-09Z-cpuv1
ports: ports:
- "${EXPOSE_MINO_PORT:-4290}:9000" - "${EXPOSE_MINIO_PORT:-4290}:9000"
- "${EXPOSE_MINIO_CONSOLE_PORT:-4291}:9001" - "${EXPOSE_MINIO_CONSOLE_PORT:-4291}:9001"
environment: environment:
MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minio-admin} MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minio-admin}
MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minio-admin} MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minio-admin}
MINIO_FORCE_NEW_KEYS: "yes" command: server /data --console-address ":9001"
BITNAMI_DEBUG: "true"
volumes: volumes:
- minio_data:/data - minio_data:/data
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/ready"]
interval: 10s
timeout: 5s
retries: 5
minio-setup: minio-setup:
image: minio/mc image: minio/mc:latest
depends_on: depends_on:
- minio - minio
environment: environment:
MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minio-admin} MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minio-admin}
MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minio-admin} MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minio-admin}
entrypoint: > entrypoint: >
/bin/sh -c " /bin/sh -c '
set -e set -e
mc alias set myminio http://minio:9000 ${MINIO_ROOT_USER:-minio-admin} ${MINIO_ROOT_PASSWORD:-minio-admin}; mc alias set myminio http://minio:9000 "$$MINIO_ROOT_USER" "$$MINIO_ROOT_PASSWORD";
until mc ls myminio; do # wait for server to be ready
echo 'Waiting for MinIO to be ready...'; until mc ls myminio >/dev/null 2>&1; do
echo "Waiting for MinIO to be ready...";
sleep 1; sleep 1;
done; done;
echo 'MinIO is up and running, configuring...'; echo "MinIO is up and running, configuring...";
mc mb myminio/avatar; mc mb -p myminio/avatar || true;
mc mb myminio/audio; mc mb -p myminio/audio || true;
mc anonymous set download myminio/avatar; mc anonymous set download myminio/avatar || true;
" echo "MinIO bucket setup complete.";
'
rabbitmq: rabbitmq:
image: docker.io/bitnami/rabbitmq:3.9 image: docker.io/rabbitmq:4.1
restart: always restart: always
volumes: volumes:
- rabbitmq_data:/bitnami - rabbitmq_data:/var/lib/rabbitmq
ports: ports:
- ${EXPOSE_RABBITMQ_NODE_PORT}:5672 - ${EXPOSE_RABBITMQ_NODE_PORT}:5672
- ${EXPOSE_RABBITMQ_MANAGEMENT_PORT_PORT}:15672 - ${EXPOSE_RABBITMQ_MANAGEMENT_PORT_PORT}:15672
environment: environment:
- RABBITMQ_USERNAME=dev RABBITMQ_DEFAULT_USER: dev
- RABBITMQ_PASSWORD=dev RABBITMQ_DEFAULT_PASS: dev
- RABBITMQ_DISK_FREE_ABSOLUTE_LIMIT=2GB
redis-q-dedup: redis-q-dedup:
image: &redisImage bitnami/redis:7.2 image: &redisImage docker.io/valkey/valkey:8.0.1
# restart: always # restart: always
ports: ports:
- "${EXPOSE_REDIS_QD_PORT:-4278}:6379" - "${EXPOSE_REDIS_QD_PORT:-4278}:6379"
environment: # https://hub.docker.com/r/bitnami/redis environment:
REDIS_PASSWORD: redis-password REDIS_PASSWORD: redis-password
REDIS_PORT: "6379" REDIS_PORT: "6379"
REDIS_AOF_ENABLED: "no" REDIS_AOF_ENABLED: "no"
@ -72,74 +78,71 @@ services:
ports: ports:
- "${EXPOSE_REDIS_HG_PORT:-4279}:6379" - "${EXPOSE_REDIS_HG_PORT:-4279}:6379"
volumes: volumes:
- redis_hg_data:/bitnami/redis/data - redis_hg_data:/data
environment: # https://hub.docker.com/r/bitnami/redis environment:
REDIS_PASSWORD: redis-password REDIS_PASSWORD: redis-password
REDIS_PORT: "6379" REDIS_PORT: "6379"
REDIS_AOF_ENABLED: "yes" REDIS_AOF_ENABLED: "yes"
REDIS_DISABLE_COMMANDS: FLUSHDB,FLUSHALL REDIS_DISABLE_COMMANDS: FLUSHDB,FLUSHALL
kvrocks-cold-geodata: kvrocks-cold-geodata:
image: apache/kvrocks image: apache/kvrocks:2.13.0
# restart: always # restart: always
ports: ports:
- "${EXPOSE_KVROCKS_CG_PORT:-4277}:6666" - "${EXPOSE_KVROCKS_CG_PORT:-4277}:6379"
volumes: volumes:
- kvrocks_cg_data:/data - kvrocks_cg_data:/var/lib/kvrocks
command: command:
- kvrocks-server - --bind
- /etc/kvrocks/redis.conf - 0.0.0.0
- --dir
- /var/lib/kvrocks
- --requirepass - --requirepass
- kvrocks-password - kvrocks-password
- --workers
- --server-threads
- "2" - "2"
- --storage-provider
- flash
- /data/flash
- --maxmemory
- "1G"
- --maxmemory-policy
- allkeys-lfu
hasura: hasura:
image: helpme_hasura image: helpme_hasura
restart: always
build: build:
context: . context: .
dockerfile: ./services/hasura/Dockerfile dockerfile: ./services/hasura/Dockerfile
volumes:
- ./services/hasura/metadata:/hasura-metadata
- ./services/hasura/migrations:/hasura-migrations
ports: ports:
- ${EXPOSE_HASURA_PORT:-4201}:8080 - ${EXPOSE_HASURA_PORT:-4201}:8080
depends_on: depends_on:
- db - db
- api - api
restart: always
environment: environment:
HASURA_GRAPHQL_INFER_FUNCTION_PERMISSIONS: "false" HASURA_GRAPHQL_INFER_FUNCTION_PERMISSIONS: "false"
HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-admin} HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-admin}
HASURA_GRAPHQL_DATABASE_URL: postgres://dev:dev@db:5432/dev HASURA_GRAPHQL_DATABASE_URL: postgres://dev:dev@db:5432/dev
HASURA_GRAPHQL_ENABLE_CONSOLE: "true" HASURA_GRAPHQL_ENABLE_CONSOLE: "true"
HASURA_GRAPHQL_JWT_SECRET: '{"jwk_url": "http://api:${API_PORT:-4200}/api/v1/oas/jwks","header":{"type":"Cookie","name":"bearer"},"claims_namespace":"${CLAIMS_NAMESPACE:-https://hasura.io/jwt/claims}"}' HASURA_GRAPHQL_DEV_MODE: "true"
HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log
HASURA_GRAPHQL_JWT_SECRET: '{"type":"EdDSA", "jwk_url": "http://api:${API_PORT:-4200}/api/v1/oas/jwks","claims_namespace":"${CLAIMS_NAMESPACE:-https://alertesecours.fr/claims}"}'
HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "anonymous" HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "anonymous"
HASURA_REMOTE_SCHEMA_API_GRAPHQL_ENDPOINT: ${HASURA_REMOTE_SCHEMA_API_GRAPHQL_ENDPOINT:-http://api:4200/api/v1/graphql} HASURA_REMOTE_SCHEMA_API_GRAPHQL_ENDPOINT: ${HASURA_REMOTE_SCHEMA_API_GRAPHQL_ENDPOINT:-http://api:4200/api/v1/graphql}
API_PORT: ${API_PORT:-4200} API_PORT: ${API_PORT:-4200}
HASURA_GRAPHQL_ENABLED_APIS: ${HASURA_GRAPHQL_ENABLED_APIS:-graphql,metadata}
hasura_console: hasura_console:
image: helpme_hasura_console image: helpme_hasura_console
restart: always
build: build:
context: . context: .
dockerfile: ./services/hasura/console/Dockerfile dockerfile: ./services/hasura/console/Dockerfile
volumes:
- ./services/hasura:/hasura
ports: ports:
- ${HASURA_CONSOLE_PORT:-4295}:${HASURA_CONSOLE_PORT:-4295} - ${HASURA_CONSOLE_PORT:-4295}:${HASURA_CONSOLE_PORT:-4295}
- ${HASURA_CONSOLE_API_PORT:-4293}:${HASURA_CONSOLE_API_PORT:-4293} - ${HASURA_CONSOLE_API_PORT:-4293}:${HASURA_CONSOLE_API_PORT:-4293}
depends_on: depends_on:
- db - db
- api - api
restart: always - hasura
environment: environment:
HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-admin} HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-admin}
HASURA_CONSOLE_INTERNAL_HOSTNAME: ${HASURA_CONSOLE_INTERNAL_HOSTNAME:-hasura_console} HASURA_CONSOLE_INTERNAL_HOSTNAME: ${HASURA_CONSOLE_INTERNAL_HOSTNAME:-hasura_console}
@ -160,12 +163,15 @@ services:
- ${EXPOSE_API_PORT:-4200}:${API_PORT:-4200} - ${EXPOSE_API_PORT:-4200}:${API_PORT:-4200}
restart: always restart: always
environment: environment:
LOGLEVEL: ${API_LOGLEVEL:-debug}
PORT: "${API_PORT:-4200}" PORT: "${API_PORT:-4200}"
JWK_FILE: /secrets/jwk.json JWK_FILE: /secrets/jwk.json
OLDJWK_FILE: /secrets/jwk2.json OLDJWK_FILE: /secrets/jwk2.json
DATABASE_URL: ${DATABASE_URL-psql://dev:dev@db/dev} DATABASE_URL: ${DATABASE_URL-psql://dev:dev@db/dev}
HASURA_GRAPHQL_URL: ${HASURA_GRAPHQL_URL:-http://hasura:8080/v1/graphql} HASURA_GRAPHQL_URL: ${HASURA_GRAPHQL_URL:-http://hasura:8080/v1/graphql}
HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-admin} HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-admin}
NOMINATIM_URL: ${NOMINATIM_URL:-http://nominatim:8080}
WHAT3WORDS_API_KEY: ${WHAT3WORDS_API_KEY-}
LOG_REQUESTS: ${LOG_REQUESTS:-false} LOG_REQUESTS: ${LOG_REQUESTS:-false}
CLAIMS_NAMESPACE: ${CLAIMS_NAMESPACE:-https://hasura.io/jwt/claims} CLAIMS_NAMESPACE: ${CLAIMS_NAMESPACE:-https://hasura.io/jwt/claims}
AMQP_URL: ${AMQP_URL-amqp://dev:dev@rabbitmq} AMQP_URL: ${AMQP_URL-amqp://dev:dev@rabbitmq}
@ -176,6 +182,8 @@ services:
REDIS_QUEUE_DEDUP_PASSWORD: redis-password REDIS_QUEUE_DEDUP_PASSWORD: redis-password
REDIS_HOT_GEODATA_HOST: redis-hot-geodata REDIS_HOT_GEODATA_HOST: redis-hot-geodata
REDIS_HOT_GEODATA_PASSWORD: redis-password REDIS_HOT_GEODATA_PASSWORD: redis-password
SENTRY_DSN: ${SENTRY_DSN_API:-""}
SENTRY_ENVIRONMENT: ${SENTRY_ENVIRONMENT:-development}
depends_on: depends_on:
- db - db
- rabbitmq - rabbitmq
@ -231,9 +239,9 @@ services:
DATABASE_URL: ${DATABASE_URL-psql://dev:dev@db/dev} DATABASE_URL: ${DATABASE_URL-psql://dev:dev@db/dev}
AMQP_URL: ${AMQP_URL-amqp://dev:dev@rabbitmq} AMQP_URL: ${AMQP_URL-amqp://dev:dev@rabbitmq}
AMQP_PORT: 5672 AMQP_PORT: 5672
NOMINATIM_URL: ${NOMINATIM_URL:-http://nominatim:8080}
HASURA_GRAPHQL_URL: ${HASURA_GRAPHQL_URL:-http://hasura:8080/v1/graphql} HASURA_GRAPHQL_URL: ${HASURA_GRAPHQL_URL:-http://hasura:8080/v1/graphql}
HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-admin} HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-admin}
NOMINATIM_URL: ${NOMINATIM_URL:-http://nominatim:8080}
WHAT3WORDS_API_KEY: ${WHAT3WORDS_API_KEY-} WHAT3WORDS_API_KEY: ${WHAT3WORDS_API_KEY-}
GOOGLE_SERVICE_ACCOUNT_KEY_FILE: ${GOOGLE_SERVICE_ACCOUNT_KEY_FILE:-/app/services/tasks/src/googleServiceAccountKey.json} GOOGLE_SERVICE_ACCOUNT_KEY_FILE: ${GOOGLE_SERVICE_ACCOUNT_KEY_FILE:-/app/services/tasks/src/googleServiceAccountKey.json}
SMTP_USER: "" SMTP_USER: ""
@ -282,6 +290,47 @@ services:
- redis-hot-geodata - redis-hot-geodata
- kvrocks-cold-geodata - kvrocks-cold-geodata
maildev:
image: maildev/maildev:2.1.0
ports:
- "${MAILDEV_SMTP_PORT:-4225}:1025"
- "${MAILDEV_WEB_PORT:-4226}:1080"
restart: always
nominatim:
image: devthefuture/nominatim:5.1
restart: always
depends_on:
nominatim-pg:
condition: service_healthy
ports:
- ${NOMINATIM_PORT:-4283}:8080
environment:
# see https://github.com/mediagis/nominatim-docker/tree/master/4.0#configuration for more options
# PBF_URL: https://download.geofabrik.de/europe/switzerland-latest.osm.pbf
PBF_PATH: /data/switzerland-latest.osm.pbf
REPLICATION_URL: https://download.geofabrik.de/europe/switzerland-updates/
# NOMINATIM_DATABASE_DSN: "pgsql:host=nominatim-pg;port=5432;user=nominatim;password=nominatim_password;dbname=nominatim"
NOMINATIM_DATABASE_DSN: "postgresql://nominatim:nominatim_password@nominatim-pg:5432/nominatim"
volumes:
- ./osm-files:/data
shm_size: 1gb
nominatim-pg:
image: postgis/postgis:16-3.4
restart: always
volumes:
- nominatim-data:/var/lib/postgresql/data
environment:
POSTGRES_DB: nominatim
POSTGRES_USER: nominatim
POSTGRES_PASSWORD: nominatim_password
healthcheck:
test: ["CMD-SHELL", "pg_isready -U nominatim -d postgres"]
interval: 10s
timeout: 5s
retries: 5
web: web:
image: helpme_web image: helpme_web
restart: always restart: always
@ -292,7 +341,7 @@ services:
- ${WEB_PORT:-4203}:8080 - ${WEB_PORT:-4203}:8080
volumes: volumes:
pgdata: pg_data:
name: helpme-pgdata name: helpme-pgdata
minio_data: minio_data:
name: helpme-miniodata name: helpme-miniodata
@ -302,3 +351,5 @@ volumes:
name: helpme-redishg-data name: helpme-redishg-data
kvrocks_cg_data: kvrocks_cg_data:
name: helpme-kvrockscg-data name: helpme-kvrockscg-data
nominatim-data:
name: helpme-nominatim-pg-data

View file

@ -11,57 +11,65 @@ services:
- pg_data:/var/lib/postgresql/data - pg_data:/var/lib/postgresql/data
minio: minio:
image: bitnami/minio:2022-debian-10 image: minio/minio:RELEASE.2025-09-07T16-13-09Z-cpuv1
container_name: minio
ports: ports:
- "${EXPOSE_MINO_PORT:-4290}:9000" - "${EXPOSE_MINIO_PORT:-4290}:9000"
- "${EXPOSE_MINIO_CONSOLE_PORT:-4291}:9001" - "${EXPOSE_MINIO_CONSOLE_PORT:-4291}:9001"
environment: environment:
MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minio-admin} MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minio-admin}
MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minio-admin} MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minio-admin}
MINIO_FORCE_NEW_KEYS: "yes" # (optional) MINIO_SERVER_URL: "http://minio:9000" # set if clients need absolute URLs
BITNAMI_DEBUG: "true" command: server /data --console-address ":9001"
volumes: volumes:
- minio_data:/data - minio_data:/data
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/ready"]
interval: 10s
timeout: 5s
retries: 5
minio-setup: minio-setup:
image: minio/mc image: minio/mc:latest
depends_on: depends_on:
- minio - minio
environment: environment:
MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minio-admin} MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minio-admin}
MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minio-admin} MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minio-admin}
entrypoint: > entrypoint: >
/bin/sh -c " /bin/sh -c '
set -e set -e
mc alias set myminio http://minio:9000 ${MINIO_ROOT_USER:-minio-admin} ${MINIO_ROOT_PASSWORD:-minio-admin}; mc alias set myminio http://minio:9000 "$$MINIO_ROOT_USER" "$$MINIO_ROOT_PASSWORD";
until mc ls myminio; do # wait for server to be ready
echo 'Waiting for MinIO to be ready...'; until mc ls myminio >/dev/null 2>&1; do
echo "Waiting for MinIO to be ready...";
sleep 1; sleep 1;
done; done;
echo 'MinIO is up and running, configuring...'; echo "MinIO is up and running, configuring...";
mc mb myminio/avatar; mc mb -p myminio/avatar || true;
mc mb myminio/audio; mc mb -p myminio/audio || true;
mc anonymous set download myminio/avatar; mc anonymous set download myminio/avatar || true;
" echo "MinIO bucket setup complete.";
'
rabbitmq: rabbitmq:
image: docker.io/bitnami/rabbitmq:3.9 image: docker.io/rabbitmq:4.1
restart: always restart: always
volumes: volumes:
- rabbitmq_data:/bitnami - rabbitmq_data:/var/lib/rabbitmq
ports: ports:
- ${EXPOSE_RABBITMQ_NODE_PORT}:5672 - ${EXPOSE_RABBITMQ_NODE_PORT}:5672
- ${EXPOSE_RABBITMQ_MANAGEMENT_PORT_PORT}:15672 - ${EXPOSE_RABBITMQ_MANAGEMENT_PORT_PORT}:15672
environment: environment:
- RABBITMQ_USERNAME=dev RABBITMQ_DEFAULT_USER: dev
- RABBITMQ_PASSWORD=dev RABBITMQ_DEFAULT_PASS: dev
- RABBITMQ_DISK_FREE_ABSOLUTE_LIMIT=2GB
redis-q-dedup: redis-q-dedup:
image: &redisImage bitnami/redis:7.2 image: &redisImage docker.io/valkey/valkey:8.0.1
# restart: always # restart: always
ports: ports:
- "${EXPOSE_REDIS_QD_PORT:-4278}:6379" - "${EXPOSE_REDIS_QD_PORT:-4278}:6379"
environment: # https://hub.docker.com/r/bitnami/redis environment:
REDIS_PASSWORD: redis-password REDIS_PASSWORD: redis-password
REDIS_PORT: "6379" REDIS_PORT: "6379"
REDIS_AOF_ENABLED: "no" REDIS_AOF_ENABLED: "no"
@ -72,39 +80,30 @@ services:
ports: ports:
- "${EXPOSE_REDIS_HG_PORT:-4279}:6379" - "${EXPOSE_REDIS_HG_PORT:-4279}:6379"
volumes: volumes:
- redis_hg_data:/bitnami/redis/data - redis_hg_data:/data
environment: # https://hub.docker.com/r/bitnami/redis environment:
REDIS_PASSWORD: redis-password REDIS_PASSWORD: redis-password
REDIS_PORT: "6379" REDIS_PORT: "6379"
REDIS_AOF_ENABLED: "yes" REDIS_AOF_ENABLED: "yes"
REDIS_DISABLE_COMMANDS: FLUSHDB,FLUSHALL REDIS_DISABLE_COMMANDS: FLUSHDB,FLUSHALL
kvrocks-cold-geodata: kvrocks-cold-geodata:
image: apache/kvrocks image: apache/kvrocks:2.13.0
# restart: always # restart: always
ports: ports:
- "${EXPOSE_KVROCKS_CG_PORT:-4277}:6379" - "${EXPOSE_KVROCKS_CG_PORT:-4277}:6379"
volumes: volumes:
- kvrocks_cg_data:/data - kvrocks_cg_data:/var/lib/kvrocks
command: command:
- kvrocks-server - --bind
- /etc/kvrocks/redis.conf - 0.0.0.0
- --dir
- /var/lib/kvrocks
- --requirepass - --requirepass
- kvrocks-password - kvrocks-password
- --workers
- --server-threads
- "2" - "2"
- --storage-provider
- flash
- /data/flash
- --maxmemory
- "1G"
- --maxmemory-policy
- allkeys-lfu
hasura: hasura:
image: helpme_hasura image: helpme_hasura
restart: always restart: always

View file

@ -67,7 +67,21 @@
"node": ">=20" "node": ">=20"
}, },
"resolutions": { "resolutions": {
"express": "5.0.0-beta.3" "express": "5.0.0-beta.3",
"@modjo/express": "1.10.4",
"@modjo/express-middleware": "1.10.4",
"@modjo/express-middleware-graphql": "1.10.4",
"@modjo/express-middleware-oapi": "1.10.4",
"@modjo/amqp": "1.10.4",
"@modjo/core": "1.10.4",
"@modjo/hasura": "1.10.4",
"@modjo/ioredis": "1.10.4",
"@modjo/microservice-oapi": "1.10.4",
"@modjo/microservice-worker": "1.10.4",
"@modjo/microservice-watcher": "1.10.4",
"@modjo/oa-graphql": "1.10.4",
"@modjo/postgres": "1.10.4",
"@modjo/sentry": "1.10.4"
}, },
"packageManager": "yarn@4.6.0" "packageManager": "yarn@4.10.3"
} }

118
yarn.lock
View file

@ -12,17 +12,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@acuminous/bitsyntax@npm:^0.1.2":
version: 0.1.2
resolution: "@acuminous/bitsyntax@npm:0.1.2"
dependencies:
buffer-more-ints: "npm:~1.0.0"
debug: "npm:^4.3.4"
safe-buffer: "npm:~5.1.2"
checksum: 10/abdc4313ae08e52fb8eeaebf53759c3b9a38983a696d77c46c24de1c065247355a1b5c02ad3618700d3fb3628ccf3ec39227a080bd1fe7adc864144ccf84b0cc
languageName: node
linkType: hard
"@adobe/css-tools@npm:^4.0.1": "@adobe/css-tools@npm:^4.0.1":
version: 4.3.1 version: 4.3.1
resolution: "@adobe/css-tools@npm:4.3.1" resolution: "@adobe/css-tools@npm:4.3.1"
@ -3139,17 +3128,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/amqp@npm:*": "@modjo/amqp@npm:1.10.4":
version: 1.9.6 version: 1.10.4
resolution: "@modjo/amqp@npm:1.9.6" resolution: "@modjo/amqp@npm:1.10.4"
dependencies: dependencies:
"@modjo/config": "npm:*" "@modjo/config": "npm:*"
"@modjo/logger": "npm:*" "@modjo/logger": "npm:*"
amqplib: "npm:^0.10.5" amqplib: "npm:^0.10.9"
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
wait-on: "npm:^6.0.1" wait-on: "npm:^6.0.1"
ya-retry: "npm:^1.2.0" ya-retry: "npm:^1.2.0"
checksum: 10/83d67b42882024011817a84c5d0cfc4cefdbaf424bc534a209dcafb4bc5031b9e252cc62ae8640e6801d8fd3b81e894ec05bbe7d1692b2837f5f0f4c61206df6 checksum: 10/ecaadc0befebd4ca04c8c3bb7601a182f58fb9cc39fb560f79b11a293759d2e524b32faa0ee676d35a3fc097a64c6a675ce6352623866503660abb8b0553acd2
languageName: node languageName: node
linkType: hard linkType: hard
@ -3179,9 +3168,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/core@npm:*": "@modjo/core@npm:1.10.4":
version: 1.9.6 version: 1.10.4
resolution: "@modjo/core@npm:1.9.6" resolution: "@modjo/core@npm:1.10.4"
dependencies: dependencies:
"@foundernetes/dbug": "npm:^1.0.0" "@foundernetes/dbug": "npm:^1.0.0"
commander: "npm:^9.1.0" commander: "npm:^9.1.0"
@ -3201,13 +3190,13 @@ __metadata:
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
pretty-ms: "npm:^7.0.1" pretty-ms: "npm:^7.0.1"
yup: "npm:^0.32.11" yup: "npm:^0.32.11"
checksum: 10/bf0a3bcad93bbf52022168d67149c324f8006e19f1ac79c9a7cffbdde5eec5b7bf2709c637d7acaf25600263a24c11c968912f488368a446fb8dc5a09ea4e4f7 checksum: 10/1f9cd6839c3d6babaf6a6c79ce52548fcf9c92db57253764d5dd7af11a7035c6d058d236f56836350cea6325a87f362fdff7f6b0e42316b4fa472220ef317d0c
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/express@npm:*": "@modjo/express@npm:1.10.4":
version: 1.9.6 version: 1.10.4
resolution: "@modjo/express@npm:1.9.6" resolution: "@modjo/express@npm:1.10.4"
dependencies: dependencies:
"@modjo/config": "npm:*" "@modjo/config": "npm:*"
"@modjo/http-logger": "npm:*" "@modjo/http-logger": "npm:*"
@ -3221,7 +3210,7 @@ __metadata:
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
websocket-express: "npm:^3.1.2" websocket-express: "npm:^3.1.2"
ws: "npm:^8.18.0" ws: "npm:^8.18.0"
checksum: 10/1c8b35030df203c9efdffbfe692ab6875c1f7efb30a32b6bc3cd17a095c88147ee8d26669bd84da7877db980921fa50559dc561c4c01d36b96ded8e8236a54f1 checksum: 10/a422f47d6e4bea68c9c26201f95745d3e7180ab0342aaf30e68ace6504b0864dd20eb9c35e1b28d05265a1e957819694f556603e12d38abc0d87ffc9240a5464
languageName: node languageName: node
linkType: hard linkType: hard
@ -3237,9 +3226,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/hasura@npm:*": "@modjo/hasura@npm:1.10.4":
version: 1.10.3 version: 1.10.4
resolution: "@modjo/hasura@npm:1.10.3" resolution: "@modjo/hasura@npm:1.10.4"
dependencies: dependencies:
"@modjo/config": "npm:*" "@modjo/config": "npm:*"
axios: "npm:^1.4.0" axios: "npm:^1.4.0"
@ -3251,7 +3240,7 @@ __metadata:
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
postgres: "npm:^3.4.4" postgres: "npm:^3.4.4"
wait-on: "npm:^6.0.1" wait-on: "npm:^6.0.1"
checksum: 10/dc6394040df857b15d678305a564ec61c2c2185a94c9eb3beb768e31307171f20533cd497fe1c857bdae194cac9ae952a739f98fb880a762097ea7277af4398e checksum: 10/efb22cead34effda18581dd7e1a58ccd77062bb579a3a294ff14a1374715dd09f679f7762235b2125714cc0d5404d32ec79e8bda5229552553d3bc56142880af
languageName: node languageName: node
linkType: hard linkType: hard
@ -3278,15 +3267,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/ioredis@npm:*": "@modjo/ioredis@npm:1.10.4":
version: 1.10.3 version: 1.10.4
resolution: "@modjo/ioredis@npm:1.10.3" resolution: "@modjo/ioredis@npm:1.10.4"
dependencies: dependencies:
"@modjo/config": "npm:*" "@modjo/config": "npm:*"
ioredis: "npm:^5.3.2" ioredis: "npm:^5.3.2"
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
wait-on: "npm:^6.0.1" wait-on: "npm:^6.0.1"
checksum: 10/dcd21f0d94e61742d29587fe62a0ebf679b53bec622eb8656df5f9c34233ea8c85c455e7b9b05fed633c5bec22fb48099b65af1fc46fc6471894b5708d7a077b checksum: 10/ec545662c86b57d26584b7e8917329cf09b573336d89a2660d9b64f295c5c69af039cf1834f33405796643489203f070cb8d3956bc159ac047737a13c69c7f11
languageName: node languageName: node
linkType: hard linkType: hard
@ -3314,9 +3303,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/microservice-oapi@npm:*": "@modjo/microservice-oapi@npm:1.10.4":
version: 1.9.6 version: 1.10.4
resolution: "@modjo/microservice-oapi@npm:1.9.6" resolution: "@modjo/microservice-oapi@npm:1.10.4"
dependencies: dependencies:
"@modjo/core": "npm:*" "@modjo/core": "npm:*"
"@modjo/express": "npm:*" "@modjo/express": "npm:*"
@ -3328,25 +3317,25 @@ __metadata:
"@modjo/oa": "npm:*" "@modjo/oa": "npm:*"
"@modjo/shutdown-handlers": "npm:*" "@modjo/shutdown-handlers": "npm:*"
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
checksum: 10/12439343c9bd46a0252071e28a851b4980b887bc909ea23c18f0ad2352ad95c071501642213f289038ac734c59cfd7c042f46b44889f19a2c42406d3087ba095 checksum: 10/f64ae25fb98f2a52dedeb66d92539880f58839844c0fd0097d0f01f06e88659c9678cd5bac3cc92078e64b25c0657eb1e924b25e67b22f13ff321768ea66a3c5
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/microservice-watcher@npm:*": "@modjo/microservice-watcher@npm:1.10.4":
version: 1.10.3 version: 1.10.4
resolution: "@modjo/microservice-watcher@npm:1.10.3" resolution: "@modjo/microservice-watcher@npm:1.10.4"
dependencies: dependencies:
"@modjo/amqp": "npm:*" "@modjo/amqp": "npm:*"
"@modjo/apollo-client": "npm:*" "@modjo/apollo-client": "npm:*"
"@modjo/core": "npm:*" "@modjo/core": "npm:*"
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
checksum: 10/1bbf5c89ee85978d5cae0b9d6facdcaad4becfe928c9d448bf01e36d780aae81a09a9ded87e550fb24f46fe2b5ea48fa59c5831554bceba1ce9ddc915adf8838 checksum: 10/48de1565cb26ace7e30abcd4c30b9fc3c08e46d77437b01d5a616b4df8ca090ab2650928007b2413b195b35c724f99732ef4cc036c7b1a08f5f59925eb75a865
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/microservice-worker@npm:*": "@modjo/microservice-worker@npm:1.10.4":
version: 1.10.3 version: 1.10.4
resolution: "@modjo/microservice-worker@npm:1.10.3" resolution: "@modjo/microservice-worker@npm:1.10.4"
dependencies: dependencies:
"@modjo/amqp": "npm:*" "@modjo/amqp": "npm:*"
"@modjo/config": "npm:*" "@modjo/config": "npm:*"
@ -3356,25 +3345,25 @@ __metadata:
lodash.kebabcase: "npm:^4.1.1" lodash.kebabcase: "npm:^4.1.1"
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
pretty-ms: "npm:^7.0.1" pretty-ms: "npm:^7.0.1"
checksum: 10/a28b4f517922c5df7df0ab23039370fc3d3c280cb9201bf5b997b15057d403ff4af55dd2422825ce9263211451ff36064b6693bd33046390d1fd6293ef96833a checksum: 10/684660c964ab807e9a8903466ad92d94328382d615e38472eb23c47242d526f9b2f69740181a3bf77dd80cab9d23f133449d178fb40bb856494f82ea59167fd3
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/minio@npm:*": "@modjo/minio@npm:*":
version: 1.10.3 version: 1.10.4
resolution: "@modjo/minio@npm:1.10.3" resolution: "@modjo/minio@npm:1.10.4"
dependencies: dependencies:
"@modjo/config": "npm:*" "@modjo/config": "npm:*"
minio: "npm:^7.0.26" minio: "npm:^7.0.26"
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
wait-on: "npm:^6.0.1" wait-on: "npm:^6.0.1"
checksum: 10/0ab5aa703899878155376150584d3d8db88b150e6923aff4bbb49e26bfa05dca543a7ab310fcbd6da2be58024378212711f9dcd58544ce0af2c06ed6265c4399 checksum: 10/1fe8b0c27318a2f122be0e1501f9421db782ca2eedb6e06bcd94693a7a385bb9b1cd43f90eed7a56d2c5268176a0a8e4fde26b8b8929d179974f2388e6320766
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/oa-graphql@npm:*": "@modjo/oa-graphql@npm:1.10.4":
version: 1.10.3 version: 1.10.4
resolution: "@modjo/oa-graphql@npm:1.10.3" resolution: "@modjo/oa-graphql@npm:1.10.4"
dependencies: dependencies:
"@apollo/server": "npm:^4.7.5" "@apollo/server": "npm:^4.7.5"
"@apollo/server-plugin-landing-page-graphql-playground": "npm:^4.0.1" "@apollo/server-plugin-landing-page-graphql-playground": "npm:^4.0.1"
@ -3398,7 +3387,7 @@ __metadata:
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
openapi-to-graphql: "npm:^3.0.5" openapi-to-graphql: "npm:^3.0.5"
subscriptions-transport-ws: "npm:^0.11.0" subscriptions-transport-ws: "npm:^0.11.0"
checksum: 10/eee7466373cd0da6e95608e00624fcabbb843834c04589950d70c875cb7b436732cc8161b78cd7c219b7ecb6a61a4ce4c8d832147142def75f03f8ebf749f2d2 checksum: 10/8d71c9f20415f6ca5ab3884e7149f2632419a6c1a0dd6e510a8289207f1ba4780a0e851a411b2b5d446ae266842a0eb48bfefef60103f68adfb5bc23c28b46d8
languageName: node languageName: node
linkType: hard linkType: hard
@ -3430,9 +3419,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/postgres@npm:*": "@modjo/postgres@npm:1.10.4":
version: 1.10.3 version: 1.10.4
resolution: "@modjo/postgres@npm:1.10.3" resolution: "@modjo/postgres@npm:1.10.4"
dependencies: dependencies:
"@opentelemetry/api": "npm:^1.9.0" "@opentelemetry/api": "npm:^1.9.0"
"@opentelemetry/core": "npm:^1.25.1" "@opentelemetry/core": "npm:^1.25.1"
@ -3440,18 +3429,18 @@ __metadata:
lodash.defaultsdeep: "npm:^4.6.1" lodash.defaultsdeep: "npm:^4.6.1"
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
postgres: "npm:^3.4.4" postgres: "npm:^3.4.4"
checksum: 10/c720ccad3a5ad970c7559cdaa8d9b53e17320058e130e9f181da3259325351fc52bf2b9b75ba0c09bf2d0d983d140023fc481ce39f406287e2803c04b4c3b635 checksum: 10/99ab84e712b8b017fb9d48e98c3903e80e1788ef0e2e9772a38538f3dfb6a38b83c08da13b820450da0170a8aa82cfec495a3690853b0ecfbd9c3b4da416ec8f
languageName: node languageName: node
linkType: hard linkType: hard
"@modjo/sentry@npm:*": "@modjo/sentry@npm:1.10.4":
version: 1.10.3 version: 1.10.4
resolution: "@modjo/sentry@npm:1.10.3" resolution: "@modjo/sentry@npm:1.10.4"
dependencies: dependencies:
"@sentry/node": "npm:^8.15.0" "@sentry/node": "npm:^8.15.0"
"@sentry/profiling-node": "npm:^8.15.0" "@sentry/profiling-node": "npm:^8.15.0"
nctx: "npm:^2.2.0" nctx: "npm:^2.2.0"
checksum: 10/81d212002021b0811cf13647333eaadccb57155d997748e8e39056ecf2f218e5b31917f4740ba87fa53308eb15a4690a874e58aeefdfe6977ad60ca251971f6f checksum: 10/88ca61e42ecb58a6b40431675971379829430624bcced36a41a39b135b5b4cf8a8a8bd7d710e30840c2344638a04a3e97480cc1c2ffed128c70be158071e768d
languageName: node languageName: node
linkType: hard linkType: hard
@ -5982,14 +5971,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"amqplib@npm:^0.10.5": "amqplib@npm:^0.10.9":
version: 0.10.5 version: 0.10.9
resolution: "amqplib@npm:0.10.5" resolution: "amqplib@npm:0.10.9"
dependencies: dependencies:
"@acuminous/bitsyntax": "npm:^0.1.2"
buffer-more-ints: "npm:~1.0.0" buffer-more-ints: "npm:~1.0.0"
url-parse: "npm:~1.5.10" url-parse: "npm:~1.5.10"
checksum: 10/bcf4bda790f8a356ba4c7d3054ae3ee397a48d6c4d51f1015f703dd7205c097ba9772577567a06eb470d13e0becdc4163c857299e50eb5a4bc888e3007832f87 checksum: 10/99f8cb123cd92903b314e2c829cee080c1d86e702c827624ff7dca4422af23d57301b193441796c0f52ad3544f177484cfe18be25f5d039f80ec7322eedcea5b
languageName: node languageName: node
linkType: hard linkType: hard
@ -20147,7 +20135,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1, safe-buffer@npm:~5.1.2": "safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
version: 5.1.2 version: 5.1.2
resolution: "safe-buffer@npm:5.1.2" resolution: "safe-buffer@npm:5.1.2"
checksum: 10/7eb5b48f2ed9a594a4795677d5a150faa7eb54483b2318b568dc0c4fc94092a6cce5be02c7288a0500a156282f5276d5688bce7259299568d1053b2150ef374a checksum: 10/7eb5b48f2ed9a594a4795677d5a150faa7eb54483b2318b568dc0c4fc94092a6cce5be02c7288a0500a156282f5276d5688bce7259299568d1053b2150ef374a