-
Notifications
You must be signed in to change notification settings - Fork 296
Conversation
@@ -81,6 +71,4 @@ | |||
POSTGRES_PORT: 5432 | |||
POSTGRES_USER: "{{ postgresUser }}" | |||
POSTGRES_PASSWORD: "{{ postgresPassword }}" | |||
REDIS_HOST: "{{ redisName }}" | |||
REDIS_PORT: 6379 | |||
KEY: node{{ key }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add end line. Also, configure up your IDE with auto-insertion of end line
docs/source/deployment.rst
Outdated
|
||
By local environment, it is meant to have daemon process and the components (Redis and Postgres) deployed without any containers. This might be helpful in cases when messing up with Docker is not preferred — generally a quick exploration of the features. | ||
By local environment, it is meant to have daemon process and the components (Postgres) deployed without any containers. This might be helpful in cases when messing up with Docker is not preferred — generally a quick exploration of the features. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and the components (Postgres) deployed
Maybe rework it with
...and Postgres deployed...
docs/source/deployment.rst
Outdated
@@ -43,7 +38,7 @@ In case of valid assumptions, the only thing that remains is to launch the daemo | |||
+---------------+-----------------------------------------------------------------+ | |||
| Parameter | Meaning | | |||
+---------------+-----------------------------------------------------------------+ | |||
| config | configuration file, containing postgres, and redis connection, | | |||
| config | configuration file, containing postgres, | | |||
| | and values to tune the system | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it possible fit this to the previous line.
d5ec5a2
to
173ae6f
Compare
docs/source/deployment.rst
Outdated
@@ -43,8 +38,8 @@ In case of valid assumptions, the only thing that remains is to launch the daemo | |||
+---------------+-----------------------------------------------------------------+ | |||
| Parameter | Meaning | | |||
+---------------+-----------------------------------------------------------------+ | |||
| config | configuration file, containing postgres, and redis connection, | | |||
| | and values to tune the system | | |||
| config | configuration file, containing postgres connection, and values | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extra comma after connection
docs/source/deployment.rst
Outdated
@@ -77,23 +72,11 @@ Then, you have to create an enviroment for the image to run without problems: | |||
Create docker network | |||
""""""""""""""""""""" | |||
|
|||
Containers for Redis, Postgres, and Iroha should run in the same virtual network, in order to be available to each other. Create a network, by typing following command (you can use any name for the network, but in the example, we use *iroha-network* name): | |||
Containers for Postgres, and Iroha should run in the same virtual network, in order to be available to each other. Create a network, by typing following command (you can use any name for the network, but in the example, we use *iroha-network* name): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extra comma after Postgres
docs/source/deployment.rst
Outdated
@@ -122,7 +105,7 @@ Running iroha daemon in docker container | |||
"""""""""""""""""""""""""""""""""""""""" | |||
|
|||
There is a list of assumptions which you should review before proceeding: | |||
* Postgres and redis servers are running on the same docker network | |||
* Postgres server are running on the same docker network |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
server is running
scripts/local-develop.sh
Outdated
@@ -1,7 +1,7 @@ | |||
#!/usr/bin/env bash | |||
|
|||
# | |||
# This simple script starts redis and postgres docker containers, | |||
# This simple script starts postgres docker containers, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
postgres docker container
Signed-off-by: Igor Egorov <igor@soramitsu.co.jp>
173ae6f
to
2838679
Compare
Codecov Report
@@ Coverage Diff @@
## develop #1014 +/- ##
========================================
Coverage 33.06% 33.06%
========================================
Files 524 524
Lines 15990 15990
Branches 10182 10182
========================================
Hits 5287 5287
Misses 1371 1371
Partials 9332 9332 Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would also be great to fix comments in postgres_block_query.hpp
, because pull request descriptions states:
all the rest places where Redis was mentioned
For the sake of complete corrections maybe iroha-api modification is required. |
Signed-off-by: Igor Egorov <igor@soramitsu.co.jp>
SonarQube analysis reported 5 issues
|
please use feature prefix for new changes as stated here https://github.com/hyperledger/iroha/wiki/Iroha-working-agreement#243-feature |
@neewy, thanks for the link! I have taken this into account. Since I have to rename the branch, this PR will be automatically closed and another will be issued instead. I have prepared complementary PR for iroha-api repository - hyperledger-iroha/iroha-api#58 |
Description of the Change
Redis dependencies were removed from docker-compose files, configuration files and all the rest places where Redis was mentioned.
Benefits
Completely removes Redis from the project after hyperledger-iroha/iroha#933