Merge pull request #271 from HiEventsDev/fix-all-in-one-docker-setup

HiEventsDev · Oct 29, 2024 · c85050a · c85050a
2 parents fd7d28f + 8fdd298
commit c85050a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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