diff options
| author | Robert Reed <robert.mc.reed@gmail.com> | 2021-08-25 22:55:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-25 22:55:17 -0700 |
| commit | 9741a5f4731dac2f4792a4b451d9a96dd1c2a381 (patch) | |
| tree | cf9fba2dd539e6890899c9d1b33ebb81093cd4f2 /Makefile | |
| parent | d937d7beb2d7d898dd937cd9e024952b56607403 (diff) | |
| parent | 27f491bda62c18e314380ddc6456962a2417b84b (diff) | |
Merge branch 'master' into feat/bash
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -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 "src:/app/src" -v "things:/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 |