roxxers
/
abra
forked from coop-cloud/abra
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into command_help_2

This commit is contained in:
3wordchant 2021-01-01 13:09:57 +01:00
parent 886ae5b7f2 7abb0191e1
commit 703dbe0a0f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -7,11 +7,11 @@ test_dind:
-d \ -d \
--name=abra-test-dind \ --name=abra-test-dind \
-e DOCKER_TLS_CERTDIR="" \ -e DOCKER_TLS_CERTDIR="" \
docker:dind decentral1se/docker-dind-bats-kcov
@DOCKER_CONTEXT=default docker exec \ @DOCKER_CONTEXT=default docker exec \
-it \ -it \
abra-test-dind \ abra-test-dind \
sh -c "apk add bats git bash && cd /workdir && bats /workdir/tests" sh -c "cd /workdir && bats /workdir/tests"
@DOCKER_CONTEXT=default docker stop abra-test-dind @DOCKER_CONTEXT=default docker stop abra-test-dind
@DOCKER_CONTEXT=default docker rm abra-test-dind @DOCKER_CONTEXT=default docker rm abra-test-dind
@ -20,8 +20,8 @@ test_docker:
-it \ -it \
--rm \ --rm \
-v $$(pwd):/workdir \ -v $$(pwd):/workdir \
docker:dind \ decentral1se/docker-dind-bats-kcov \
sh -c "apk add bats git bash && cd /workdir && bats /workdir/tests" sh -c "cd /workdir && bats /workdir/tests"
test_local: test_local:
bats tests bats tests