diff options
| author | Andrew Brookins <andrew.brookins@redislabs.com> | 2020-07-09 14:53:00 -0700 |
|---|---|---|
| committer | Andrew Brookins <andrew.brookins@redislabs.com> | 2020-07-09 14:53:00 -0700 |
| commit | 58ca166a9c7228f24fdd074c4785fe7303851cd4 (patch) | |
| tree | 340e32b77798e0a64f151dc6c75b9f16d5c6c39f | |
| parent | bd1d7936c11b3fd750a3e48a2e554f2f0b317d19 (diff) | |
| download | redis-py-58ca166a9c7228f24fdd074c4785fe7303851cd4.tar.gz | |
WIP on base image
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | docker-compose.yml | 6 | ||||
| -rw-r--r-- | docker/base/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/master/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/sentinel_1/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/sentinel_2/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/sentinel_3/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/slave/Dockerfile | 2 | ||||
| -rw-r--r-- | tests/conftest.py | 11 |
9 files changed, 33 insertions, 7 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..fb3e0b6 --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ +.PHONY: base + +build: + docker build -t redis-py-base docker/base + docker-compose down + docker-compose build + +dev: + docker-compose up -d + +test: dev + docker-compose run test tox --redis-url="redis://master:6379/9" diff --git a/docker-compose.yml b/docker-compose.yml index f335f3c..c7a7c0a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,3 +25,9 @@ services: build: docker/sentinel_3 ports: - "26381:26381" + + test: + image: fkrull/multi-python:latest + working_dir: /redis-py + volumes: + - .:/redis-py diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile new file mode 100644 index 0000000..ab97386 --- /dev/null +++ b/docker/base/Dockerfile @@ -0,0 +1 @@ +FROM redis:6.0.5-buster diff --git a/docker/master/Dockerfile b/docker/master/Dockerfile index c51249d..af81fb3 100644 --- a/docker/master/Dockerfile +++ b/docker/master/Dockerfile @@ -1,4 +1,4 @@ -FROM redis:6.0.5-buster +FROM redis-py-base:latest COPY redis.conf /etc/conf/redis/redis.conf diff --git a/docker/sentinel_1/Dockerfile b/docker/sentinel_1/Dockerfile index 016d873..e3c3e7b 100644 --- a/docker/sentinel_1/Dockerfile +++ b/docker/sentinel_1/Dockerfile @@ -1,4 +1,4 @@ -FROM redis:6.0.5-buster +FROM redis-py-base:latest COPY redis.conf /etc/conf/redis/redis.conf diff --git a/docker/sentinel_2/Dockerfile b/docker/sentinel_2/Dockerfile index 1a379be..cd59777 100644 --- a/docker/sentinel_2/Dockerfile +++ b/docker/sentinel_2/Dockerfile @@ -1,4 +1,4 @@ -FROM redis:6.0.5-buster +FROM redis-py-base:latest COPY redis.conf /etc/conf/redis/redis.conf diff --git a/docker/sentinel_3/Dockerfile b/docker/sentinel_3/Dockerfile index e1e92d8..2e81a15 100644 --- a/docker/sentinel_3/Dockerfile +++ b/docker/sentinel_3/Dockerfile @@ -1,4 +1,4 @@ -FROM redis:6.0.5-buster +FROM redis-py-base:latest COPY redis.conf /etc/conf/redis/redis.conf diff --git a/docker/slave/Dockerfile b/docker/slave/Dockerfile index f9bd1ad..74c1fb0 100644 --- a/docker/slave/Dockerfile +++ b/docker/slave/Dockerfile @@ -1,4 +1,4 @@ -FROM redis:6.0.5-buster +FROM redis-py-base:latest COPY redis.conf /etc/conf/redis/redis.conf diff --git a/tests/conftest.py b/tests/conftest.py index 7d64609..4398175 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,14 +14,21 @@ REDIS_6_VERSION = '5.9.0' REDIS_INFO = {} -default_redis_url = "redis://localhost:6379/9" +DEFAULT_REDIS_URL = "redis://localhost:6379/9" +DEFAULT_REDIS_MASTER_HOST = "localhost" + def pytest_addoption(parser): - parser.addoption('--redis-url', default=default_redis_url, + parser.addoption('--redis-url', default=DEFAULT_REDIS_URL, action="store", help="Redis connection string," " defaults to `%(default)s`") + parser.addoption('--master-host', default=DEFAULT_REDIS_MASTER_HOST, + action="store", + help="Redis master hostname," + " defaults to `%(default)s`") + def _get_info(redis_url): |