Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
328bfbea
Commit
328bfbea
authored
Mar 25, 2019
by
mdj33
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add version to chain33.toml file to connect peers internally
parent
94669431
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
Makefile
Makefile
+2
-2
docker-compose-pre.sh
build/docker-compose-pre.sh
+2
-0
docker-compose.sh
build/docker-compose.sh
+0
-1
No files found.
Makefile
View file @
328bfbea
...
@@ -122,7 +122,7 @@ docker-compose: ## build docker-compose for chain33 run
...
@@ -122,7 +122,7 @@ docker-compose: ## build docker-compose for chain33 run
@
cd
build
&&
if
!
[
-d
ci
]
;
then
\
@
cd
build
&&
if
!
[
-d
ci
]
;
then
\
make
-C
../
;
\
make
-C
../
;
\
fi
;
\
fi
;
\
cp
chain33
*
Dockerfile docker-compose
*
ci/
&&
cd
ci/
&&
./docker-compose-pre.sh run
$(proj)
$(dapp)
&&
cd
../..
./docker-compose-pre.sh modify
&&
cp
chain33
*
Dockerfile docker-compose
*
ci/
&&
cd
ci/
&&
./docker-compose-pre.sh run
$(proj)
$(dapp)
&&
cd
../..
docker-compose-down
:
##
build docker-compose for chain33 run
docker-compose-down
:
##
build docker-compose for chain33 run
@
cd
build
&&
if
[
-d
ci
]
;
then
\
@
cd
build
&&
if
[
-d
ci
]
;
then
\
...
@@ -131,7 +131,7 @@ docker-compose-down: ## build docker-compose for chain33 run
...
@@ -131,7 +131,7 @@ docker-compose-down: ## build docker-compose for chain33 run
cd
..
cd
..
fork-test
:
##
build fork-test for chain33 run
fork-test
:
##
build fork-test for chain33 run
@
cd
build
&&
cp
chain33
*
Dockerfile system-fork-test.sh docker-compose
*
ci/
&&
cd
ci/
&&
./docker-compose-pre.sh forktest
$(proj)
$(dapp)
&&
cd
../..
@
cd
build
&&
./docker-compose-pre.sh modify
&&
cp
chain33
*
Dockerfile system-fork-test.sh docker-compose
*
ci/
&&
cd
ci/
&&
./docker-compose-pre.sh forktest
$(proj)
$(dapp)
&&
cd
../..
clean
:
##
Remove previous build
clean
:
##
Remove previous build
...
...
build/docker-compose-pre.sh
View file @
328bfbea
...
@@ -126,6 +126,8 @@ function main() {
...
@@ -126,6 +126,8 @@ function main() {
else
else
./system-fork-test.sh
"
${
PROJ
}
"
./system-fork-test.sh
"
${
PROJ
}
"
fi
fi
elif
[
"
${
OP
}
"
==
"modify"
]
;
then
sed
-i
$sedfix
'/^useGithub=.*/a version=1'
chain33.toml
fi
fi
}
}
...
...
build/docker-compose.sh
View file @
328bfbea
...
@@ -78,7 +78,6 @@ function base_init() {
...
@@ -78,7 +78,6 @@ function base_init() {
sed
-i
$sedfix
's/^isSeed=.*/isSeed=true/g'
chain33.toml
sed
-i
$sedfix
's/^isSeed=.*/isSeed=true/g'
chain33.toml
sed
-i
$sedfix
's/^innerSeedEnable=.*/innerSeedEnable=false/g'
chain33.toml
sed
-i
$sedfix
's/^innerSeedEnable=.*/innerSeedEnable=false/g'
chain33.toml
sed
-i
$sedfix
's/^useGithub=.*/useGithub=false/g'
chain33.toml
sed
-i
$sedfix
's/^useGithub=.*/useGithub=false/g'
chain33.toml
sed
-i
$sedfix
'/^useGithub=.*/a version=1'
chain33.toml
# rpc
# rpc
sed
-i
$sedfix
's/^jrpcBindAddr=.*/jrpcBindAddr="0.0.0.0:8801"/g'
chain33.toml
sed
-i
$sedfix
's/^jrpcBindAddr=.*/jrpcBindAddr="0.0.0.0:8801"/g'
chain33.toml
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment