Merge branch 'main' into command_help_2
This commit is contained in:
commit
703dbe0a0f
8
Makefile
8
Makefile
@ -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
|
||||||
|
Reference in New Issue
Block a user