diff options
| author | Andrew Brookins <andrew.brookins@redislabs.com> | 2020-07-13 23:14:26 +0000 |
|---|---|---|
| committer | Andrew Brookins <andrew.brookins@redislabs.com> | 2020-07-13 23:14:26 +0000 |
| commit | a10751d94bbf2dd9bfc2f8946f5a3934df41b346 (patch) | |
| tree | 9fad6320d81d19ee4d5b0b550075784460647022 /docker-compose.yml | |
| parent | 639a8dc11858f87ee571791bb751315de690541b (diff) | |
| download | redis-py-a10751d94bbf2dd9bfc2f8946f5a3934df41b346.tar.gz | |
Improvements based on review feedback:
1. All make targets are now PHONY.
2. Cleaned up the 'dev' target so that it passes --build
to docker-compose.
3. Added pypy-specific tox environments. And added a new
Dockerfile to build an image for the "test" container
that contains pypy and pypy3.
4. Added a `make clean` target. It removes containers but
requires the user to confirm.
5. Specify the depends_on order for slave -> master and
made all sentinels depend on the slave coming up. The
container running doesn't mean that redis is actually
ready though, so I wrapped the "test" target in the
Makefile with a wait script that waits until
master is responding on port 6379.
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index c7a7c0a..12d92b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,26 +8,36 @@ services: slave: build: docker/slave + depends_on: + - "master" ports: - "6380:6380" sentinel_1: build: docker/sentinel_1 + depends_on: + - "slave" ports: - "26379:26379" sentinel_2: build: docker/sentinel_2 + depends_on: + - "slave" ports: - "26380:26380" sentinel_3: build: docker/sentinel_3 + depends_on: + - "slave" ports: - "26381:26381" test: - image: fkrull/multi-python:latest + build: docker/test working_dir: /redis-py + depends_on: + - "sentinel_3" volumes: - .:/redis-py |