diff options
| author | Andy McCurdy <andy@andymccurdy.com> | 2020-07-16 14:40:29 -0700 |
|---|---|---|
| committer | Andy McCurdy <andy@andymccurdy.com> | 2020-07-16 14:40:29 -0700 |
| commit | 8c7d2da53714c6c41364790ebbd68c10dbe38d83 (patch) | |
| tree | 3f614f70f5e28d39077ec248bbf8606e7edd930f | |
| parent | 841d5cead05c18a9d2ad212ed2bee46670c5dff8 (diff) | |
| download | redis-py-8c7d2da53714c6c41364790ebbd68c10dbe38d83.tar.gz | |
testing docker-entry
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | docker-compose.yml | 4 | ||||
| -rwxr-xr-x | docker-entry.sh | 17 |
5 files changed, 29 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 95940af..4b09cfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,3 @@ services: script: - make test - -after_success: - - docker-compose run -e CODECOV_TOKEN=$CODECOV_TOKEN test codecov @@ -4,4 +4,6 @@ RUN apt update && apt install -y pypy pypy-dev pypy3-dev curl RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3.8 get-pip.py RUN pip install codecov +WORKDIR /redis-py + COPY . /redis-py @@ -1,14 +1,14 @@ .PHONY: base clean dev test base: - docker build -t redis-py-base docker/base + docker build -t redis-py-base docker/base -dev: base - docker-compose up -d --build +dev: base + docker-compose up -d --build -test: dev - docker-compose run --rm test util/wait-for-it.sh master:6379 -- tox -- --redis-url=redis://master:6379/9 +test: dev + docker-compose run --rm -e TRAVIS test /redis-py/docker-entry.sh clean: - docker-compose stop - docker-compose rm -f + docker-compose stop + docker-compose rm -f diff --git a/docker-compose.yml b/docker-compose.yml index 631e2f8..3adf9c2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,6 +36,8 @@ services: test: build: . - working_dir: /redis-py depends_on: - "sentinel_3" + environment: + REDIS_MASTER_HOST: master + REDIS_MASTER_PORT: "6379" diff --git a/docker-entry.sh b/docker-entry.sh new file mode 100755 index 0000000..d1f232c --- /dev/null +++ b/docker-entry.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# This is the entrypoint for "make clean". It invokes Tox. If running +# within the CI environment, it also runs codecov + +set -eu + +REDIS_MASTER="${REDIS_MASTER_HOST}":"${REDIS_MASTER_PORT}" +echo "Testing against Redis Server: ${REDIS_MASTER}" + +# use the wait-for-it util to ensure the server is running before invoking Tox +util/wait-for-it.sh ${REDIS_MASTER} -- tox -- --redis-url=redis://"${REDIS_MASTER}"/9 + +# if the TRAVIS env var is defined, invoke "codecov" +if [ ! -z ${TRAVIS-} ]; then + codecov +fi |