use docker stack compose format
Some checks failed
ci / test (push) Failing after 1m44s
fp/our CI/CD / build (push) Has been cancelled

This commit is contained in:
CJ_Clippy 2025-09-28 21:01:11 -08:00
parent 90aa4da02a
commit 5f3c8ac47a
2 changed files with 3 additions and 15 deletions

View File

@ -1,8 +1,5 @@
services: services:
postgres: postgres:
container_name: our-postgres
image: postgres:17 image: postgres:17
restart: unless-stopped restart: unless-stopped
env_file: ./.env env_file: ./.env
@ -17,27 +14,20 @@ services:
server: server:
image: gitea.futureporn.net/futureporn/our:latest image: gitea.futureporn.net/futureporn/our:latest
container_name: our-server
env_file: ./.env env_file: ./.env
depends_on: depends_on:
postgres: - postgres
condition: service_healthy
pull_policy: always
init: true init: true
entrypoint: > entrypoint: >
sh -c "npx prisma migrate deploy && npm run start:server" sh -c "npx prisma migrate deploy && npm run start:server"
volumes: volumes:
- /mnt/vfs/futureporn:/mnt/vfs/futureporn - /mnt/vfs/futureporn:/mnt/vfs/futureporn
worker: worker:
image: gitea.futureporn.net/futureporn/our:latest image: gitea.futureporn.net/futureporn/our:latest
container_name: our-worker
env_file: ./.env env_file: ./.env
depends_on: depends_on:
postgres: - postgres
condition: service_healthy
pull_policy: always
init: true init: true
entrypoint: > entrypoint: >
sh -c "npm run start:worker" sh -c "npm run start:worker"
@ -54,5 +44,3 @@ services:
volumes: volumes:
pgdata: pgdata:

View File

@ -1,7 +1,7 @@
{ {
"name": "futureporn-our", "name": "futureporn-our",
"private": true, "private": true,
"version": "2.8.21", "version": "2.8.22",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "concurrently npm:dev:serve npm:dev:build:server npm:dev:build:client npm:dev:worker npm:dev:compose npm:dev:sftp npm:dev:qbittorrent npm:dev:tailscale", "dev": "concurrently npm:dev:serve npm:dev:build:server npm:dev:build:client npm:dev:worker npm:dev:compose npm:dev:sftp npm:dev:qbittorrent npm:dev:tailscale",