From 3535d8e0af1f01daf119bf840c110ff630f2117f Mon Sep 17 00:00:00 2001 From: Daniel Mursa Date: Mon, 3 Feb 2025 16:11:40 +0100 Subject: [PATCH] [maykinmedia/open-api-framework#100] Add quick-start.yml --- .github/workflows/quick-start.yml | 16 +++++++++++++ bin/setup_configuration.sh | 13 +++++++---- docker-compose.yml | 38 +++++++++++++++++-------------- 3 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/quick-start.yml diff --git a/.github/workflows/quick-start.yml b/.github/workflows/quick-start.yml new file mode 100644 index 00000000..2f230344 --- /dev/null +++ b/.github/workflows/quick-start.yml @@ -0,0 +1,16 @@ +name: quick-start + +on: + push: + branches: + - master + pull_request: + branches: + - '**' + workflow_dispatch: + +jobs: + open-api-workflow-quick-start: + uses: maykinmedia/open-api-workflows/.github/workflows/quick-start.yml@feature/add-quick-start + with: + superuser: 'open-admin' \ No newline at end of file diff --git a/bin/setup_configuration.sh b/bin/setup_configuration.sh index 9082f4fe..a133e964 100755 --- a/bin/setup_configuration.sh +++ b/bin/setup_configuration.sh @@ -1,9 +1,14 @@ #!/bin/bash -# setup initial configuration using environment variables +# setup initial configuration using a yaml file # Run this script from the root of the repository -#set -e +set -e -src/manage.py migrate -src/manage.py setup_configuration --yaml-file setup_configuration/data.yaml +if [[ "${RUN_SETUP_CONFIG,,}" =~ ^(true|1|yes)$ ]]; then + # wait for required services + /wait_for_db.sh + + src/manage.py migrate + src/manage.py setup_configuration --yaml-file setup_configuration/data.yaml +fi diff --git a/docker-compose.yml b/docker-compose.yml index 57eeec16..f8e2fa33 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,22 +20,22 @@ services: web: build: . environment: &app-env - - DJANGO_SETTINGS_MODULE=nrc.conf.docker - - SECRET_KEY=${SECRET_KEY:-\(,gc7VE(#CO