diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 27 | ||||
| -rwxr-xr-x | docker-entry.sh | 2 |
3 files changed, 27 insertions, 4 deletions
@@ -7,7 +7,7 @@ dev: base docker-compose up -d --build test: dev - docker-compose run --rm -e TRAVIS test /redis-py/docker-entry.sh + docker-compose run --rm test /redis-py/docker-entry.sh clean: docker-compose stop diff --git a/docker-compose.yml b/docker-compose.yml index 3adf9c2..b76bf83 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,5 +39,28 @@ services: depends_on: - "sentinel_3" environment: - REDIS_MASTER_HOST: master - REDIS_MASTER_PORT: "6379" + - REDIS_MASTER_HOST=master + - REDIS_MASTER_PORT=6379 + - CI_BUILD_ID + - CI_BUILD_URL + - CI_JOB_ID + - CODECOV_ENV + - CODECOV_SLUG + - CODECOV_TOKEN + - CODECOV_URL + - SHIPPABLE + - TRAVIS + - TRAVIS_BRANCH + - TRAVIS_COMMIT + - TRAVIS_JOB_ID + - TRAVIS_JOB_NUMBER + - TRAVIS_OS_NAME + - TRAVIS_PULL_REQUEST + - TRAVIS_REPO_SLUG + - TRAVIS_TAG + - VCS_BRANCH_NAME + - VCS_COMMIT_ID + - VCS_PULL_REQUEST + - VCS_SLUG + - VCS_TAG + diff --git a/docker-entry.sh b/docker-entry.sh index d1f232c..4722f35 100755 --- a/docker-entry.sh +++ b/docker-entry.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is the entrypoint for "make clean". It invokes Tox. If running +# This is the entrypoint for "make test". It invokes Tox. If running # within the CI environment, it also runs codecov set -eu |