From d8e6caa8f7b2853965853d9b2cb107774b685f07 Mon Sep 17 00:00:00 2001 From: Harpo Harbert Date: Mon, 30 Oct 2023 12:29:48 -0700 Subject: [PATCH] Splits wagtail-tests --- docker-compose.yml | 15 +-------------- ov | 16 ++++++++-------- test.yml | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 test.yml diff --git a/docker-compose.yml b/docker-compose.yml index 02b9d67..157bdad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: . target: base - image: ov-wag + image: ghcr.io/wgbh-mla/ov-wag:pr-76 volumes: - ./:/app/ entrypoint: /app/docker_entrypoints/dev.sh @@ -15,20 +15,7 @@ services: delay: 5s max_attempts: 3 window: 5s - wagtail-tests: - build: - context: . - target: test - image: ov-tests - volumes: - - ./:/app/ - entrypoint: /app/docker_entrypoints/test.sh - environment: - - OV_DB_ENGINE=django.db.backends.sqlite3 - - OV_DB_NAME=testdb db: image: postgres:14.2-alpine - volumes: - - ./db:/var/lib/postgresql/data:Z user: ${UID}:${GID} restart: always diff --git a/ov b/ov index 0a38b96..48ded48 100755 --- a/ov +++ b/ov @@ -7,14 +7,14 @@ USAGE:\n\n COMMANDS:\n\n -\t b | build \t build the docker image\n -\t c | cmd \t run a bash command with the wagtail docker image\n -\t coverage \t run the coverage tests -\t d | dev \t start a development server\n -\t h | help \t prints this help text\n -\t s | shell \t enter into a python shell with the app context\n -\t t | test \t run the wagtail test suite -\t m | manage \t run a manage.py command +\t b | build \t build the docker image\n +\t c | cmd \t run a bash command with the wagtail docker image\n +\t cov | coverage\t run the coverage tests\n +\t d | dev \t start a development server\n +\t h | help \t prints this help text\n +\t s | shell \t enter into a python shell with the app context\n +\t t | test \t run the wagtail test suite\n +\t m | manage \t run a manage.py command\n\n " COMPOSE="docker compose -f docker-compose.yml" diff --git a/test.yml b/test.yml new file mode 100644 index 0000000..d47ba1d --- /dev/null +++ b/test.yml @@ -0,0 +1,14 @@ +version: '3.8' + +services: + tests: + build: + context: . + target: test + image: ov-tests + volumes: + - ./:/app/ + entrypoint: /app/docker_entrypoints/test.sh + environment: + - OV_DB_ENGINE=django.db.backends.sqlite3 + - OV_DB_NAME=testdb