From e7074ba94191abbfa31f0e3edb00667c7c24834b Mon Sep 17 00:00:00 2001 From: James Taylor Date: Fri, 4 Feb 2022 14:27:40 +0000 Subject: [PATCH] Update REST sample with Redis password (#629) Signed-off-by: James Taylor --- asset-transfer-basic/rest-api-typescript/README.md | 2 ++ .../rest-api-typescript/docker-compose.yaml | 7 +++++-- asset-transfer-basic/rest-api-typescript/package.json | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/asset-transfer-basic/rest-api-typescript/README.md b/asset-transfer-basic/rest-api-typescript/README.md index 2677b6db..eece4914 100644 --- a/asset-transfer-basic/rest-api-typescript/README.md +++ b/asset-transfer-basic/rest-api-typescript/README.md @@ -121,6 +121,7 @@ TEST_NETWORK_HOME=$HOME/fabric-samples/test-network npm run generateEnv Start a Redis server (Redis is used to store the queue of submit transactions) ```shell +export REDIS_PASSWORD=$(uuidgen) npm run start:redis ``` @@ -147,6 +148,7 @@ TEST_NETWORK_HOME=$HOME/fabric-samples/test-network AS_LOCAL_HOST=false npm run Start the sample REST server and Redis server ```shell +export REDIS_PASSWORD=$(uuidgen) docker-compose up -d ``` diff --git a/asset-transfer-basic/rest-api-typescript/docker-compose.yaml b/asset-transfer-basic/rest-api-typescript/docker-compose.yaml index 0ef763dc..3060b591 100644 --- a/asset-transfer-basic/rest-api-typescript/docker-compose.yaml +++ b/asset-transfer-basic/rest-api-typescript/docker-compose.yaml @@ -3,6 +3,7 @@ version: '3' services: redis: image: 'redis' + command: ['--maxmemory-policy','noeviction','--requirepass','${REDIS_PASSWORD}'] ports: - 6379:6379 networks: @@ -12,9 +13,11 @@ services: image: 'ghcr.io/hyperledger/fabric-rest-sample:latest' command: ['start:dotenv'] ports: - - 3000:3000 + - 3000:3000 env_file: - - ./.env + - ./.env + environment: + - REDIS_PASSWORD networks: - fabric_test diff --git a/asset-transfer-basic/rest-api-typescript/package.json b/asset-transfer-basic/rest-api-typescript/package.json index c8350cd0..82cbcb07 100644 --- a/asset-transfer-basic/rest-api-typescript/package.json +++ b/asset-transfer-basic/rest-api-typescript/package.json @@ -58,7 +58,7 @@ "start": "node --require source-map-support/register ./dist", "start:dotenv": "node --require source-map-support/register --require dotenv/config ./dist", "start:dev": "node --require source-map-support/register --require dotenv/config ./dist | pino-pretty", - "start:redis": "docker run -p 6379:6379 --name fabric-sample-redis -d redis --maxmemory-policy noeviction", + "start:redis": "docker run -p 6379:6379 --name fabric-sample-redis -d redis --maxmemory-policy noeviction --requirepass \"${REDIS_PASSWORD}\"", "test": "jest" }, "author": "Hyperledger",