From 57a6d88a3c2e40023e24762fe23f2b6b6303e62e Mon Sep 17 00:00:00 2001 From: Jared Katz Date: Mon, 28 Sep 2020 08:40:40 -0400 Subject: [PATCH 1/4] Add wait-for-it submodule to /extern directory --- .gitmodules | 3 +++ extern/wait-for-it | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 extern/wait-for-it diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..02f07d70 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "extern/wait-for-it"] + path = extern/wait-for-it + url = git@github.com:vishnubob/wait-for-it.git diff --git a/extern/wait-for-it b/extern/wait-for-it new file mode 160000 index 00000000..81b1373f --- /dev/null +++ b/extern/wait-for-it @@ -0,0 +1 @@ +Subproject commit 81b1373f17855a4dc21156cfe1694c31d7d1792e From 39ab6e7c27da00f8cb0cc8ab6741610b9dc2c7e7 Mon Sep 17 00:00:00 2001 From: Jared Katz Date: Mon, 28 Sep 2020 08:42:02 -0400 Subject: [PATCH 2/4] Use wait-for-it.sh to ensure Postgres is up before running migrations --- {{cookiecutter.project_slug}}/scripts/build.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.project_slug}}/scripts/build.sh b/{{cookiecutter.project_slug}}/scripts/build.sh index 59758033..a892cd30 100755 --- a/{{cookiecutter.project_slug}}/scripts/build.sh +++ b/{{cookiecutter.project_slug}}/scripts/build.sh @@ -3,11 +3,9 @@ # Build and run containers docker-compose up -d -# Hack to wait for postgres container to be up before running alembic migrations -sleep 5; - -# Run migrations -docker-compose run --rm backend alembic upgrade head +# Wait 10 seconds for postgres service to appear on port 5432, then run alembic migrations +extern/wait-for-it/wait-for-it.sh postgres:5432 --strict --timeout=10 \ + -- docker-compose run --rm backend alembic upgrade head # Create initial data docker-compose run --rm backend python3 app/initial_data.py \ No newline at end of file From 4aea88ee53ad5a36510d57af0b47969c3155c56c Mon Sep 17 00:00:00 2001 From: Jared Katz Date: Mon, 28 Sep 2020 08:43:42 -0400 Subject: [PATCH 3/4] Fix typo --- .dependabot/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dependabot/config.yml b/.dependabot/config.yml index 4fd947e5..91a6e9e4 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -5,7 +5,7 @@ update_configs: - package_manager: 'javascript' directory: '{{cookiecutter.project_slug}}/frontend' update_schedule: 'monthly' - # Keep Dockerfile up to date, batching pull requests weekly + # Keep Dockerfile up to date, batching pull requests monthly - package_manager: 'python' directory: '{{cookiecutter.project_slug}}/backend' update_schedule: 'monthly' From eb8849f97d787805f8bbe3f4785c0c298de9b1b1 Mon Sep 17 00:00:00 2001 From: Jared Katz Date: Mon, 28 Sep 2020 17:13:28 -0400 Subject: [PATCH 4/4] Check for git submodule updates monthly --- .dependabot/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.dependabot/config.yml b/.dependabot/config.yml index 91a6e9e4..08a661bd 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -1,5 +1,9 @@ version: 1 update_configs: + # Keep submodules up to date, batching pull requests monthly + - package_manager: 'submodules' + directory: '/extern' + update_schedule: 'monthly' # Keep package.json (& lockfiles) up to date as soon as # new versions are published to the npm registry - package_manager: 'javascript'