summaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorChayim <chayim@users.noreply.github.com>2021-12-16 09:36:56 +0200
committerGitHub <noreply@github.com>2021-12-16 09:36:56 +0200
commit18c6809b761bc6755349e1d7e08e74e857ec2c65 (patch)
tree29ba60b2d00dbc999981e2def8a51fd0a07a9e6a /docker/base
parenta8b8f142399a62e64c3003adda2d9563eea95ef4 (diff)
downloadredis-py-18c6809b761bc6755349e1d7e08e74e857ec2c65.tar.gz
Support for password-encrypted SSL private keys (#1782)
Adding support for SSL private keys with a password. This PR also adds support for future SSL tests.
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile1
-rw-r--r--docker/base/Dockerfile.cluster3
-rw-r--r--docker/base/Dockerfile.sentinel1
-rw-r--r--docker/base/Dockerfile.stunnel11
4 files changed, 15 insertions, 1 deletions
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 60be374..c76d15d 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -1,3 +1,4 @@
+# produces redisfab/redis-py:6.2.6
FROM redis:6.2.6-buster
CMD ["redis-server", "/redis.conf"]
diff --git a/docker/base/Dockerfile.cluster b/docker/base/Dockerfile.cluster
index 70e8013..70df5ba 100644
--- a/docker/base/Dockerfile.cluster
+++ b/docker/base/Dockerfile.cluster
@@ -1,3 +1,4 @@
+# produces redisfab/redis-py-cluster:6.2.6
FROM redis:6.2.6-buster
COPY create_cluster.sh /create_cluster.sh
@@ -5,4 +6,4 @@ RUN chmod +x /create_cluster.sh
EXPOSE 16379 16380 16381 16382 16383 16384
-CMD [ "/create_cluster.sh"] \ No newline at end of file
+CMD [ "/create_cluster.sh"]
diff --git a/docker/base/Dockerfile.sentinel b/docker/base/Dockerfile.sentinel
index 93c16a7..ef659e3 100644
--- a/docker/base/Dockerfile.sentinel
+++ b/docker/base/Dockerfile.sentinel
@@ -1,3 +1,4 @@
+# produces redisfab/redis-py-sentinel:6.2.6
FROM redis:6.2.6-buster
CMD ["redis-sentinel", "/sentinel.conf"]
diff --git a/docker/base/Dockerfile.stunnel b/docker/base/Dockerfile.stunnel
new file mode 100644
index 0000000..bf45109
--- /dev/null
+++ b/docker/base/Dockerfile.stunnel
@@ -0,0 +1,11 @@
+# produces redisfab/stunnel:latest
+FROM ubuntu:18.04
+
+RUN apt-get update -qq --fix-missing
+RUN apt-get upgrade -qqy
+RUN apt install -qqy stunnel
+RUN mkdir -p /etc/stunnel/conf.d
+RUN echo "foreground = yes\ninclude = /etc/stunnel/conf.d" > /etc/stunnel/stunnel.conf
+RUN chown -R root:root /etc/stunnel/
+
+CMD ["/usr/bin/stunnel"]