From 9628c57963c3434e792ccaf38dcf59a27d144d6a Mon Sep 17 00:00:00 2001
From: Steven Bal <steven@maykinmedia.nl>
Date: Fri, 3 Jan 2025 11:05:01 +0100
Subject: [PATCH] :green_heart: [maykinmedia/objects-api#509] Use master branch
 in quickstart job

---
 .github/workflows/quick_start.yml | 7 +++++--
 docker-compose.yml                | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/quick_start.yml b/.github/workflows/quick_start.yml
index 91f0baa..f90776b 100644
--- a/.github/workflows/quick_start.yml
+++ b/.github/workflows/quick_start.yml
@@ -7,8 +7,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download docker-compose file
-        # todo replace branch name with master after the change is merge
-        run: wget https://raw.githubusercontent.com/maykinmedia/objecttypes-api/feature/merge-docker-composes/docker-compose.yml
+        run: wget https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/docker-compose.yml
+      - name: Download setup-configuration data file
+        run: wget -P docker/setup_configuration https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/docker/setup_configuration/data.yaml
       - name: Start docker containers
         run: docker compose up -d --no-build
       - name: Wait for migrations to finish
@@ -18,6 +19,8 @@ jobs:
             echo "Migrations not finished, waiting..."
             sleep 3
           done
+      - name: Show web-init logs
+        run: docker compose logs web-init
       - name: Load fixtures
         run: docker compose exec -T web src/manage.py loaddata demodata
       - name: Create superuser
diff --git a/docker-compose.yml b/docker-compose.yml
index 1e9d68c..eeac146 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,6 +31,7 @@ services:
         condition: service_completed_successfully
 
   web-init:
+    image: maykinmedia/objecttypes-api:latest
     build: .
     environment:
       <<: *app-env