Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
venv
__pycache__/
.DS_Store
edgefl/file_write/
edgefl/tmp_dir/
edgefl/env_files/mnist
EdgeLake
.idea/
edgefl/logs/
8 changes: 0 additions & 8 deletions .idea/.gitignore

This file was deleted.

38 changes: 0 additions & 38 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

10 changes: 5 additions & 5 deletions EdgeLake/docker_makefile/docker-compose-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ services:
container_name: ${NODE_NAME}
stdin_open: true
tty: true
network_mode: host
# ports:
# - ${EDGELAKE_SERVER_PORT}:${EDGELAKE_SERVER_PORT}
# - ${EDGELAKE_REST_PORT}:${EDGELAKE_REST_PORT}
network_mode: bridge
ports:
- ${EDGELAKE_SERVER_PORT}:${EDGELAKE_SERVER_PORT}
- ${EDGELAKE_REST_PORT}:${EDGELAKE_REST_PORT}
volumes:
- ${NODE_NAME}-anylog:/app/EdgeLake/anylog
- ${NODE_NAME}-blockchain:/app/EdgeLake/blockchain
Expand All @@ -21,4 +21,4 @@ volumes:
${NODE_NAME}-anylog:
${NODE_NAME}-blockchain:
${NODE_NAME}-data:
${NODE_NAME}-local-scripts:
${NODE_NAME}-local-scripts:
4 changes: 2 additions & 2 deletions EdgeLake/docker_makefile/edgelake_operator1.env
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ MEMORY=false
# TCP connection information for Master Node
## Use your Master node's docker IP ##
## Command docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' edgelake-master ##
LEDGER_CONN=172.18.0.2:32048
LEDGER_CONN=172.17.0.2:32048
# How often to sync from blockchain
BLOCKCHAIN_SYNC=10 seconds

Expand Down Expand Up @@ -117,4 +117,4 @@ SYSLOG_MONITORING=false

#--- Advanced Settings ---
# Whether to automatically run a local (or personalized) script at the end of the process
DEPLOY_LOCAL_SCRIPT=false
DEPLOY_LOCAL_SCRIPT=false
4 changes: 2 additions & 2 deletions EdgeLake/docker_makefile/edgelake_operator2.env
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ MEMORY=false
# TCP connection information for Master Node
## Use your Master node's docker IP ##
## Command docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' edgelake-master ##
LEDGER_CONN=172.18.0.2:32048
LEDGER_CONN=172.17.0.2:32048
# How often to sync from blockchain
BLOCKCHAIN_SYNC=10 seconds

Expand Down Expand Up @@ -117,4 +117,4 @@ SYSLOG_MONITORING=false

#--- Advanced Settings ---
# Whether to automatically run a local (or personalized) script at the end of the process
DEPLOY_LOCAL_SCRIPT=false
DEPLOY_LOCAL_SCRIPT=false
4 changes: 2 additions & 2 deletions EdgeLake/docker_makefile/edgelake_operator3.env
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ MEMORY=false
# TCP connection information for Master Node
## Use your Master node's docker IP ##
## Command docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' edgelake-master ##
LEDGER_CONN=172.18.0.2:32048
LEDGER_CONN=172.17.0.2:32048
# How often to sync from blockchain
BLOCKCHAIN_SYNC=10 seconds

Expand Down Expand Up @@ -117,4 +117,4 @@ SYSLOG_MONITORING=false

#--- Advanced Settings ---
# Whether to automatically run a local (or personalized) script at the end of the process
DEPLOY_LOCAL_SCRIPT=false
DEPLOY_LOCAL_SCRIPT=false
4 changes: 2 additions & 2 deletions EdgeLake/docker_makefile/edgelake_operator4.env
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ DB_USER="demo"
# Password correlated to database user
DB_PASSWD="passwd"
# Database IP address
DB_IP=192.168.1.148
DB_IP=192.168.56.1
# Database port number
DB_PORT=5432
# Whether to set autocommit data
Expand Down Expand Up @@ -58,7 +58,7 @@ MEMORY=false
# TCP connection information for Master Node
## Use your Master node's docker IP ##
## Command docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' edgelake-master ##
LEDGER_CONN=74.207.235.89:32048
LEDGER_CONN=172.19.0.2:32048
# How often to sync from blockchain
BLOCKCHAIN_SYNC=10 seconds

Expand Down
2 changes: 1 addition & 1 deletion EdgeLake/docker_makefile/master.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
EDGELAKE_TYPE=master
TAG=1.3.2412.8-roy-arm64
TAG=1.3.2501-arm64
EDGELAKE_SERVER_PORT=32048
EDGELAKE_REST_PORT=32049
NODE_NAME=master
Expand Down
2 changes: 1 addition & 1 deletion EdgeLake/docker_makefile/operator1.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
EDGELAKE_TYPE=operator
TAG=1.3.2412.8-roy-arm64
TAG=1.3.2501-arm64
EDGELAKE_SERVER_PORT=32148
EDGELAKE_REST_PORT=32149
NODE_NAME=operator1
Expand Down
2 changes: 1 addition & 1 deletion EdgeLake/docker_makefile/operator2.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
EDGELAKE_TYPE=operator
TAG=1.3.2412.8-roy-arm64
TAG=1.3.2501-arm64
EDGELAKE_SERVER_PORT=32248
EDGELAKE_REST_PORT=32249
NODE_NAME=operator2
Expand Down
2 changes: 1 addition & 1 deletion EdgeLake/docker_makefile/operator3.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
EDGELAKE_TYPE=operator
TAG=1.3.2412.8-roy-arm64
TAG=1.3.2501-arm64
EDGELAKE_SERVER_PORT=32348
EDGELAKE_REST_PORT=32349
NODE_NAME=operator3
Expand Down
Loading