summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorAndrew Brookins <andrew.brookins@redislabs.com>2020-07-13 23:14:26 +0000
committerAndrew Brookins <andrew.brookins@redislabs.com>2020-07-13 23:14:26 +0000
commita10751d94bbf2dd9bfc2f8946f5a3934df41b346 (patch)
tree9fad6320d81d19ee4d5b0b550075784460647022 /docker
parent639a8dc11858f87ee571791bb751315de690541b (diff)
downloadredis-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')
-rw-r--r--docker/test/Dockerfile3
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
new file mode 100644
index 0000000..768b081
--- /dev/null
+++ b/docker/test/Dockerfile
@@ -0,0 +1,3 @@
+FROM fkrull/multi-python:latest
+
+RUN apt install -y pypy pypy3