From b0d6ac7d8ebf1db33664cee84f5863d37880eab3 Mon Sep 17 00:00:00 2001 From: Christopher Milne Date: Wed, 22 Oct 2025 10:46:40 -0400 Subject: [PATCH 1/3] rework docker-compose so we can run sidekiq locally and unlock webhooks --- .tool-versions | 1 + docker-compose.yml | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 00000000..ae5ecdb2 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +ruby 3.4.2 diff --git a/docker-compose.yml b/docker-compose.yml index a30ce3a6..dd1d687b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,17 +3,50 @@ services: depends_on: postgres: condition: service_healthy + redis: + condition: service_healthy image: docuseal/docuseal:latest ports: - - 3000:3000 + - 3005:3000 volumes: - ./docuseal:/data/docuseal environment: - FORCE_SSL=${HOST} - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/docuseal + - REDIS_URL=redis://redis:6379/0 + - SIDEKIQ_BASIC_AUTH_PASSWORD=sidekiq + + sidekiq: + depends_on: + postgres: + condition: service_healthy + redis: + condition: service_healthy + image: docuseal/docuseal:latest + command: sh -c "cd /app && bundle exec sidekiq" + volumes: + - ./docuseal:/data/docuseal + environment: + - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/docuseal + - REDIS_URL=redis://redis:6379/0 + - SIDEKIQ_BASIC_AUTH_PASSWORD=sidekiq + + redis: + image: redis:7-alpine + ports: + - 6379:6379 + volumes: + - './redis_data:/data' + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 5s + timeout: 5s + retries: 5 postgres: image: postgres:15 + ports: + - 5436:5432 volumes: - './pg_data:/var/lib/postgresql/data' environment: @@ -28,7 +61,7 @@ services: caddy: image: caddy:latest - command: caddy reverse-proxy --from $HOST --to app:3000 + command: caddy reverse-proxy --from ${HOST:-localhost} --to app:3000 ports: - 80:80 - 443:443 @@ -36,4 +69,4 @@ services: volumes: - .:/data environment: - - HOST=${HOST} + - HOST=${HOST:-localhost} From d1116bdfd825fa36479e2980e4c409e8e1720fce Mon Sep 17 00:00:00 2001 From: Christopher Milne Date: Wed, 22 Oct 2025 11:47:47 -0400 Subject: [PATCH 2/3] fix env issue with sidekiq running in docker-compose --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index dd1d687b..f18399a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,7 @@ services: volumes: - ./docuseal:/data/docuseal environment: + - FORCE_SSL=${HOST} - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/docuseal - REDIS_URL=redis://redis:6379/0 - SIDEKIQ_BASIC_AUTH_PASSWORD=sidekiq From 8dd74aaadb8d06dcb45a96c70f9e268a10eea25a Mon Sep 17 00:00:00 2001 From: Christopher Milne Date: Wed, 22 Oct 2025 14:20:18 -0400 Subject: [PATCH 3/3] attempt to make webhook endpoint on host accessible from within docker container --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index f18399a3..2552f579 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,6 +31,8 @@ services: - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/docuseal - REDIS_URL=redis://redis:6379/0 - SIDEKIQ_BASIC_AUTH_PASSWORD=sidekiq + extra_hosts: + - "host.docker.internal:host-gateway" redis: image: redis:7-alpine