diff --git a/compose.yaml b/compose.yaml index 5ba81d5911..c759e345a3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -97,6 +97,7 @@ services: command: --log_bin_trust_function_creators=1 --sql_mode=NO_ENGINE_SUBSTITUTION volumes: - db-data:/var/lib/mysql + - ${OLCS_ETL_DIR:-../olcs-etl}:/var/lib/etl ports: - 3306:3306 environment: diff --git a/docs/app/local-setup.md b/docs/app/local-setup.md index 2bcdbc5b29..6637f8eee3 100644 --- a/docs/app/local-setup.md +++ b/docs/app/local-setup.md @@ -69,8 +69,20 @@ You will need: 1. Start the application + :::warning + + The `olcs-etl` project needs to be mounted as a volume in the `db` container. By default, the directory is set to `../olcs-etl`. + + You can customise this using the `OLCS_ETL_DIR` environment variable before running the `docker compose` command. + + ```sh + export OLCS_ETL_DIR=/path/to/olcs-etl + ``` + + ::: + ```bash - docker-compose up -d + docker compose up -d ``` 1. Run the local setup script - this script will also as a local reset and is safe to run multiple times. diff --git a/docs/infrastructure/docker/overview.md b/docs/infrastructure/docker/overview.md index 57c1947062..912f962802 100644 --- a/docs/infrastructure/docker/overview.md +++ b/docs/infrastructure/docker/overview.md @@ -14,9 +14,9 @@ Images are also pushed to the GitHub Container Registry (GHCR) for public access ::: -# Layers +# Image hierarchy -The VOL application images are built up of the following high-level layers: +The VOL application image hierarchy is as follows: ```mermaid --- diff --git a/packages/local-refresh/actions/ResetDatabase.ts b/packages/local-refresh/actions/ResetDatabase.ts index 4c4b5354b4..98c4b7709b 100644 --- a/packages/local-refresh/actions/ResetDatabase.ts +++ b/packages/local-refresh/actions/ResetDatabase.ts @@ -41,7 +41,7 @@ export default class ResetDatabase implements ActionInterface { }, ]); - if (!response["database-refresh"]) { + if (response["refresh-type"] === undefined) { return false; } @@ -55,6 +55,10 @@ export default class ResetDatabase implements ActionInterface { validate: (value) => (fs.existsSync(value) ? true : "Path does not exist"), }); + if (etlDirectoryPrompt.directory === undefined) { + return false; + } + cache.setKey("etlDirectory", etlDirectoryPrompt.directory); cache.save();