diff --git a/.github/workflows/quick_start.yml b/.github/workflows/quick_start.yml index 87cd7f26..7cb86d93 100644 --- a/.github/workflows/quick_start.yml +++ b/.github/workflows/quick_start.yml @@ -7,15 +7,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Download docker-compose file - run: wget https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/docker-compose-quickstart.yml -O docker-compose-qs.yml + run: wget https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/docker-compose.yml - name: Start docker containers - run: docker-compose -f docker-compose-qs.yml up -d + run: docker compose up -d --no-build - name: Wait until DB container starts run: sleep 10 - name: Load fixtures - run: docker-compose -f docker-compose-qs.yml exec -T web src/manage.py loaddata demodata + run: docker compose exec -T web src/manage.py loaddata demodata - name: Create superuser - run: docker-compose -f docker-compose-qs.yml exec -T web src/manage.py createsuperuser --username admin --email admin@admin.nl --no-input + run: docker-compose exec -T web src/manage.py createsuperuser --username admin --email admin@admin.nl --no-input - name: Check main page run: | curl_status=$(curl -w '%{http_code}' -o /dev/null -s http://localhost:8001/) diff --git a/docker-compose-quickstart.yml b/docker-compose-quickstart.yml deleted file mode 100644 index d4295be2..00000000 --- a/docker-compose-quickstart.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: '3' - -services: - db: - image: postgres - environment: - - POSTGRES_USER=${DB_USER:-objecttypes} - - POSTGRES_PASSWORD=${DB_PASSWORD:-objecttypes} - - web: - image: maykinmedia/objecttypes-api:latest - environment: - - DJANGO_SETTINGS_MODULE=objecttypes.conf.docker - - SECRET_KEY=${SECRET_KEY:-fgv=c0hz&tl*8*3m3893@m+1pstrvidc9e^5@fpspmg%cyz15d} - - ALLOWED_HOSTS=* - ports: - - 8001:8000 - depends_on: - - db diff --git a/docker-compose.yml b/docker-compose.yml index 5e2122a0..4bcc595c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ services: image: redis web: + image: maykinmedia/objecttypes-api:latest build: . environment: &app-env - DJANGO_SETTINGS_MODULE=objecttypes.conf.docker @@ -35,6 +36,7 @@ services: condition: service_completed_successfully web-init: + image: maykinmedia/objecttypes-api:latest build: . environment: *app-env command: /setup_configuration.sh