From d3c3b31cb7ba97819757cc7ff04f60e96d4672fe Mon Sep 17 00:00:00 2001 From: Okunev Aleksey Date: Mon, 24 Aug 2020 15:34:53 +0300 Subject: [PATCH] feat: add rejson support --- .mdeprc | 1 + README.md | 5 +++-- bin/cmds/test_cmds/auto-compose.js | 24 ++++++++++++++++++++ yarn.lock | 36 ++---------------------------- 4 files changed, 30 insertions(+), 36 deletions(-) diff --git a/.mdeprc b/.mdeprc index 2871782..1a2a7ef 100644 --- a/.mdeprc +++ b/.mdeprc @@ -7,6 +7,7 @@ "tester_flavour": "chrome-tester", "services": [ "redisSentinel", + "rejsonSentinel", "redisCluster", "rabbitmq", "postgres", diff --git a/README.md b/README.md index 192fbd2..a3eeccb 100644 --- a/README.md +++ b/README.md @@ -116,8 +116,9 @@ Options: --extras any extras for tester docker container, will be merged [string] [default: {}] --services enable listed services - [array] [choices: "redis", "redisCluster", "redisSentinel", "postgres", - "rabbitmq"] + [array] [choices: "redisSentinel", "rejsonSentinel", "redisCluster", + "rabbitmq", "postgres", "elasticsearch", "cassandra", + "couchdb"] --docker_compose_version, --dcv docker-compose version to use [default: "1.11.2"] --docker_compose_force, --dcf forces to install local copy of diff --git a/bin/cmds/test_cmds/auto-compose.js b/bin/cmds/test_cmds/auto-compose.js index 8482c76..4915219 100644 --- a/bin/cmds/test_cmds/auto-compose.js +++ b/bin/cmds/test_cmds/auto-compose.js @@ -9,6 +9,8 @@ const { mkdir } = require('shelljs'); const SERVICE_MAP = { redis, + rejson, + rejsonSentinel, redisCluster, redisSentinel, postgres, @@ -89,6 +91,14 @@ function redis(compose, argv) { }, argv.extras.redis); } +function rejson(compose, argv) { + compose.services.rejson = merge({ + image: 'redislabs/rejson', + hostname: 'rejson', + expose: ['6379'], + }, argv.extras.rejson); +} + function redisSentinel(compose, argv) { redis(compose, argv); @@ -103,6 +113,20 @@ function redisSentinel(compose, argv) { }, argv.extras.redisSentinel); } +function rejsonSentinel(compose, argv) { + rejson(compose, argv); + + const entrypoint = path.resolve(__dirname, '../../../templates/redis-sentinel.sh'); + compose.services['rejson-Sentinel'] = merge({ + image: 'redis:5-alpine', + hostname: 'rejson-sentinel', + expose: ['26379'], + depends_on: ['rejson'], + volumes: [`${entrypoint}:/entrypoint.sh:ro`], + command: '/bin/sh /entrypoint.sh rejson', + }, argv.extras.rejsonSentinel); +} + function postgres(compose, argv) { compose.services.postgres = merge({ image: 'postgres:12-alpine', diff --git a/yarn.lock b/yarn.lock index f22efcc..c609e03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2333,7 +2333,7 @@ debug@^3.1.0: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -3810,7 +3810,7 @@ import-modules@^2.0.0: resolved "https://registry.yarnpkg.com/import-modules/-/import-modules-2.0.0.tgz#9c1e13b4e7a15682f70a6e3fa29534e4540cfc5d" integrity sha512-iczM/v9drffdNnABOKwj0f9G3cFDon99VcG1mxeBsdqnbd+vnQ5c2uAiCHNQITqFTOPaEvwg3VjoWCur0uHLEw== -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -5064,11 +5064,6 @@ lockfile@^1.0.4: dependencies: signal-exit "^3.0.2" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -5077,33 +5072,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= - -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= - lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -5164,11 +5137,6 @@ lodash.reduce@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs= -lodash.restparam@*: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= - lodash.set@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"