Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore/upgrade node #63

Merged
merged 8 commits into from
Jan 5, 2024
Merged

Chore/upgrade node #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9706d2b
test new node
mattdean-digicatapult Jan 4, 2024
cba424d
0.7.13
mattdean-digicatapult Jan 4, 2024
fccecbb
Change CLI args
mattdean-digicatapult Jan 4, 2024
0771de4
change cli args to match v10 of node
mattdean-digicatapult Jan 4, 2024
b2d6fef
Merge remote-tracking branch 'origin/main' into chore/upgrade-node
mattdean-digicatapult Jan 5, 2024
debd640
Revert image version to latest
mattdean-digicatapult Jan 5, 2024
f93a288
Merge remote-tracking branch 'origin/main' into chore/upgrade-node
mattdean-digicatapult Jan 5, 2024
081fba4
0.7.16
mattdean-digicatapult Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 38 additions & 42 deletions docker-compose-3-persona.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,15 @@ networks:
driver: default

services:

##################################################################################
## Heidi the Hydrogen Producer ###################################################
##################################################################################
##################################################################################
## Heidi the Hydrogen Producer ###################################################
##################################################################################

hydrogen-producer-postgres-hyproof-api:
image: postgres:16.1-alpine
container_name: hydrogen-producer-postgres-hyproof-api
# ports:
# - 5432:5432
# ports:
# - 5432:5432
volumes:
- hydrogen-producer-hyproof-api-storage:/var/lib/postgresql/data
environment:
Expand All @@ -61,8 +60,8 @@ services:
hydrogen-producer-postgres-identity:
image: postgres:16.1-alpine
container_name: hydrogen-producer-postgres-identity
# ports:
# - 5433:5432
# ports:
# - 5433:5432
volumes:
- hydrogen-producer-identity-storage:/var/lib/postgresql/data
environment:
Expand Down Expand Up @@ -101,14 +100,13 @@ services:
container_name: hydrogen-producer-node
command: --base-path /data
--alice
--unsafe-ws-external
--unsafe-rpc-external
--rpc-cors all
--node-key 0000000000000000000000000000000000000000000000000000000000000001
# ports:
# - 30333:30333
# - 9944:9944
# - 9933:9933
# ports:
# - 30333:30333
# - 9944:9944
# - 9933:9933
restart: on-failure
networks: ['hydrogen-producer', 'chain']

Expand Down Expand Up @@ -147,15 +145,15 @@ services:
restart: on-failure
networks: ['hydrogen-producer', 'ipfs']

##################################################################################
## Emma the Energy Owner #########################################################
##################################################################################
##################################################################################
## Emma the Energy Owner #########################################################
##################################################################################

energy-owner-postgres-hyproof-api:
image: postgres:16.1-alpine
container_name: energy-owner-postgres-hyproof-api
# ports:
# - 5442:5432
# ports:
# - 5442:5432
volumes:
- energy-owner-hyproof-api-storage:/var/lib/postgresql/data
environment:
Expand All @@ -167,8 +165,8 @@ services:
energy-owner-postgres-identity:
image: postgres:16.1-alpine
container_name: energy-owner-postgres-identity
# ports:
# - 5443:5432
# ports:
# - 5443:5432
volumes:
- energy-owner-identity-storage:/var/lib/postgresql/data
environment:
Expand Down Expand Up @@ -207,15 +205,14 @@ services:
container_name: energy-owner-node
command: --base-path /data/
--bob
--unsafe-ws-external
--unsafe-rpc-external
--rpc-cors all
--node-key 0000000000000000000000000000000000000000000000000000000000000002
--bootnodes /dns4/alice/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp
# ports:
# - 31333:30333
# - 10044:9944
# - 10033:9933
# ports:
# - 31333:30333
# - 10044:9944
# - 10033:9933
restart: on-failure
networks: ['energy-owner', 'chain']

Expand Down Expand Up @@ -253,15 +250,15 @@ services:
restart: on-failure
networks: ['energy-owner', 'ipfs']

##################################################################################
## Reginald the Regulator ########################################################
##################################################################################
##################################################################################
## Reginald the Regulator ########################################################
##################################################################################

regulator-postgres-hyproof-api:
image: postgres:16.1-alpine
container_name: regulator-postgres-hyproof-api
# ports:
# - 5452:5432
# ports:
# - 5452:5432
volumes:
- regulator-hyproof-api-storage:/var/lib/postgresql/data
environment:
Expand All @@ -273,8 +270,8 @@ services:
regulator-postgres-identity:
image: postgres:16.1-alpine
container_name: regulator-postgres-identity
# ports:
# - 5453:5432
# ports:
# - 5453:5432
volumes:
- regulator-identity-storage:/var/lib/postgresql/data
environment:
Expand Down Expand Up @@ -313,15 +310,14 @@ services:
container_name: regulator-node
command: --base-path /data/
--charlie
--unsafe-ws-external
--unsafe-rpc-external
--rpc-cors all
--node-key 0000000000000000000000000000000000000000000000000000000000000003
--bootnodes /dns4/alice/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp
# ports:
# - 32333:30333
# - 10144:9944
# - 10133:9933
# ports:
# - 32333:30333
# - 10144:9944
# - 10133:9933
restart: on-failure
networks: ['regulator', 'chain']

Expand Down Expand Up @@ -359,9 +355,9 @@ services:
restart: on-failure
networks: ['regulator', 'ipfs']

##################################################################################
## IPFS ##########################################################################
##################################################################################
##################################################################################
## IPFS ##########################################################################
##################################################################################

ipfs:
image: ipfs/go-ipfs:v0.25.0
Expand All @@ -372,9 +368,9 @@ services:
/base16/
0000000000000000000000000000000000000000000000000000000000000000
ports:
# - 4001:4001
# - 4001:4001
- 8080:8080
# - 5001:5001
# - 5001:5001
networks: ['ipfs']
volumes:
- ipfs:/data/ipfs
Expand Down
3 changes: 1 addition & 2 deletions docker-compose-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@ services:
command: --base-path /data/
--dev
--manual-seal
--unsafe-ws-external
--unsafe-rpc-external
--ws-max-connections 512
--rpc-max-connections 512
--rpc-cors all
ports:
- 30333:30333
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@ services:
container_name: node
command: --base-path /data/
--dev
--unsafe-ws-external
--unsafe-rpc-external
--ws-max-connections 512
--rpc-max-connections 512
--rpc-cors all
ports:
- 30333:30333
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@digicatapult/dscp-hyproof-api",
"version": "0.7.15",
"version": "0.7.16",
"description": "An OpenAPI API service for DSCP",
"main": "src/index.ts",
"scripts": {
Expand Down