From 33302b07c3ec3c5f887f43d269f0b2ca5145a4f9 Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Sun, 22 Aug 2021 13:49:28 -0400 Subject: trying to fix all workflows to work. --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 87e124b..453ed5b 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ current_dir := $(dir $(mkfile_path)) source_dir := ${current_dir}"src" artifact_dir := ${current_dir}"things" +config_dir := ${current_dir}"configs" DOCKER_CMD := "docker" .DEFAULT_GOAL := help @@ -34,27 +35,27 @@ build-container: check-requirements ## Build docker container. config: check-requirements ## Generate configuration. @echo "\nGenerate configuration..\n" && \ - ${DOCKER_CMD} run --rm --name DM-config -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard python3 -i generate_configuration.py && \ + ${DOCKER_CMD} run --rm --name DM-config -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard python3 -i generate_configuration.py && \ echo "Done" .PHONY: config build-models: check-requirements ## Build models. @echo "\nGenerate configured model..\n" && \ cd ${current_dir} && \ - ${DOCKER_CMD} run --rm --name DM-run -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard python3 -i dactyl_manuform.py && \ + ${DOCKER_CMD} run --rm --name DM-run -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard python3 -i dactyl_manuform.py && \ echo "Done" .PHONY: config build-models: check-requirements ## Build models. @echo "\nGenerate release models..\n" && \ cd ${current_dir} && \ - ${DOCKER_CMD} run --rm --name DM-release-build -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard python3 -i model_builder.py && \ + ${DOCKER_CMD} run --rm --name DM-release-build -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard python3 -i model_builder.py && \ echo "Done" .PHONY: config shell: check-requirements ## Open an interactive shell inside a container. - @${DOCKER_CMD} run --rm -it --name DM-shell -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard bash && \ + @${DOCKER_CMD} run --rm -it --name DM-shell -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard bash && \ echo "\nBye!" .PHONY: shell -- cgit v1.2.3