You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2020/07/02 14:32:41 UTC
svn commit: r1879447 - in /httpd/test/framework/trunk:
scripts/memcached-init.sh scripts/redis-init.sh t/conf/ssl/ssl.conf.in
Author: jorton
Date: Thu Jul 2 14:32:41 2020
New Revision: 1879447
URL: http://svn.apache.org/viewvc?rev=1879447&view=rev
Log:
Add scripts to run memcached/redis via docker, and use env var
to specify which SSLSessionCache setting to test if
TEST_SSL_SESSCACHE is defined.
Added:
httpd/test/framework/trunk/scripts/memcached-init.sh (with props)
httpd/test/framework/trunk/scripts/redis-init.sh (with props)
Modified:
httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in
Added: httpd/test/framework/trunk/scripts/memcached-init.sh
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/scripts/memcached-init.sh?rev=1879447&view=auto
==============================================================================
--- httpd/test/framework/trunk/scripts/memcached-init.sh (added)
+++ httpd/test/framework/trunk/scripts/memcached-init.sh Thu Jul 2 14:32:41 2020
@@ -0,0 +1,6 @@
+#!/bin/bash -ex
+DOCKER=${DOCKER:-`which docker 2>/dev/null || which podman 2>/dev/null`}
+IMG=docker.io/memcached
+
+${DOCKER} pull ${IMG}
+${DOCKER} run -d -p 11211:11211 ${IMG}
Propchange: httpd/test/framework/trunk/scripts/memcached-init.sh
------------------------------------------------------------------------------
svn:executable = *
Added: httpd/test/framework/trunk/scripts/redis-init.sh
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/scripts/redis-init.sh?rev=1879447&view=auto
==============================================================================
--- httpd/test/framework/trunk/scripts/redis-init.sh (added)
+++ httpd/test/framework/trunk/scripts/redis-init.sh Thu Jul 2 14:32:41 2020
@@ -0,0 +1,6 @@
+#!/bin/bash -ex
+DOCKER=${DOCKER:-`which docker 2>/dev/null || which podman 2>/dev/null`}
+IMG=docker.io/redis
+
+${DOCKER} pull ${IMG}
+${DOCKER} run -d -p 6379:6379 ${IMG}
Propchange: httpd/test/framework/trunk/scripts/redis-init.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in?rev=1879447&r1=1879446&r2=1879447&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in Thu Jul 2 14:32:41 2020
@@ -6,7 +6,7 @@
AddType application/x-pkcs7-crl .crl
<IfDefine TEST_SSL_SESSCACHE>
- SSLSessionCache shmcb
+ SSLSessionCache ${SSL_SESSCACHE}
</IfDefine>
<IfDefine !TEST_SSL_SESSCACHE>
SSLSessionCache none