merge: updates from upstream

Makefile

@@ -32,14 +32,6 @@ docs:  ## create documentation files
 test:  ## run tests
 	@mix test --cover --trace --slowest 10
 
-.PHONY: compose_up
-compose_up:  ## start containers for this service
-	@$(COMPOSE) up -d
-
-.PHONY: compose_watch
-compose_watch:  ## start containers for this service watching for updates in filesystem
-	@$(COMPOSE) up -w
-
 .PHONY: compose_database_create
 compose_database_create:
 	@$(COMPOSE) run --rm --entrypoint mix app ecto.create
@@ -59,6 +51,22 @@ compose_ps:  ## status of containers
 compose_remote:  ## connect to remote node
 	@$(COMPOSE) exec app ./priv/docker/service/docker-remote.sh
 
+.PHONY: compose_test
+compose_test:  ## execute test on docker environment
+	@$(COMPOSE) --profile test run --rm test
+
+.PHONY: compose_test_shell
+compose_test_shell:  ## enter test environment shell
+	@$(COMPOSE) --profile test run --rm --entrypoint bash test -c bash
+
+.PHONY: compose_up
+compose_up:  ## start containers for this service
+	@$(COMPOSE) up -d
+
+.PHONY: compose_watch
+compose_watch:  ## start containers for this service watching for updates in filesystem
+	@$(COMPOSE) up -w
+
 .PHONY: help
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'