From ced9c6c050a74429e8dc4e4ce565634278295d9e Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 21 Apr 2022 01:02:55 +1000 Subject: [PATCH] Sqlite docker-compose file no longer requires .env file As this is only used for CI this is OK --- .github/workflows/docker_test.yaml | 4 ++++ docker/docker-compose.sqlite.yml | 12 ++++++------ docker/sqlite-config.env | 10 ---------- 3 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 docker/sqlite-config.env diff --git a/.github/workflows/docker_test.yaml b/.github/workflows/docker_test.yaml index d96621ee66..0865b0b0cf 100644 --- a/.github/workflows/docker_test.yaml +++ b/.github/workflows/docker_test.yaml @@ -14,6 +14,10 @@ on: branches: - 'master' - 'stable' + pull_request: + branches: + - 'master' + - 'stable' jobs: diff --git a/docker/docker-compose.sqlite.yml b/docker/docker-compose.sqlite.yml index e42c43a09c..0c08109af5 100644 --- a/docker/docker-compose.sqlite.yml +++ b/docker/docker-compose.sqlite.yml @@ -27,9 +27,9 @@ services: volumes: # Ensure you specify the location of the 'src' directory at the end of this file - src:/home/inventree - env_file: - # Environment variables required for the dev server are configured in dev-config.env - - sqlite-config.env + environment: + - INVENTREE_DEBUG=True + - INVENTREE_DB_ENGINE=sqlite restart: unless-stopped # Background worker process handles long-running or periodic tasks @@ -44,9 +44,9 @@ services: volumes: # Ensure you specify the location of the 'src' directory at the end of this file - src:/home/inventree - env_file: - # Environment variables required for the dev server are configured in dev-config.env - - sqlite-config.env + environment: + - INVENTREE_DEBUG=True + - INVENTREE_DB_ENGINE=sqlite restart: unless-stopped volumes: diff --git a/docker/sqlite-config.env b/docker/sqlite-config.env deleted file mode 100644 index b41660ad6e..0000000000 --- a/docker/sqlite-config.env +++ /dev/null @@ -1,10 +0,0 @@ -# InvenTree environment variables for a development setup - -# Set DEBUG to False for a production environment! -INVENTREE_DEBUG=True -INVENTREE_DEBUG_LEVEL=INFO - -# Database configuration options -# Note: The example setup is for a PostgreSQL database (change as required) -INVENTREE_DB_ENGINE=sqlite -INVENTREE_DB_NAME=/home/inventree/dev/inventree_db.sqlite3