From 8fdd29878f456b5ff921d49755526bf19e55f1c7 Mon Sep 17 00:00:00 2001 From: Dave Earley Date: Mon, 28 Oct 2024 19:14:19 -0700 Subject: [PATCH] Fix all-in-one Docker setup --- backend/database/migrations/schema.sql | 1 - docker/all-in-one/docker-compose.yml | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/database/migrations/schema.sql b/backend/database/migrations/schema.sql index bb359414a7..4b20e570d5 100644 --- a/backend/database/migrations/schema.sql +++ b/backend/database/migrations/schema.sql @@ -276,7 +276,6 @@ create table if not exists tickets deleted_at timestamp, type varchar(20) default 'PAID'::character varying not null, is_hidden boolean default false, - start_collapsed boolean default false, primary key (id), constraint fk_tickets_event_id foreign key (event_id) references events diff --git a/docker/all-in-one/docker-compose.yml b/docker/all-in-one/docker-compose.yml index f315b428bb..68c5a79c45 100644 --- a/docker/all-in-one/docker-compose.yml +++ b/docker/all-in-one/docker-compose.yml @@ -22,11 +22,17 @@ services: - DATABASE_URL=postgresql://postgres:secret@postgres:5432/hi-events depends_on: - - postgres + postgres: + condition: service_healthy postgres: image: postgres:latest container_name: postgres + healthcheck: + test: [ "CMD-SHELL", "pg_isready -U postgres" ] + interval: 10s + timeout: 5s + retries: 5 environment: POSTGRES_DB: hi-events POSTGRES_USER: postgres