Organizing and simplifing

NeoResearch · Jun 18, 2018 · 05619cb · 05619cb
1 parent 78c7818
commit 05619cb
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 25 deletions.
diff --git a/build_everything.sh b/build_everything.sh
@@ -37,9 +37,9 @@ done
 
 # Flag for changing neo-scan host variable - However, neoscan frontpage is still not working properly
 if (($SERVER_MODE)); then
-	(cd dockers-neo-scan-neon/docker-neo-scan; sed -i '/HOST_NAME/c\HOST_NAME=https://neoscan.neocompiler.io' ./.env )
+	(cd docker-compose-eco-network; sed -i '/HOST_NAME/c\HOST_NAME=https://neoscan.neocompiler.io' ./.env )
 else
-	(cd dockers-neo-scan-neon/docker-neo-scan; sed -i '/HOST_NAME/c\HOST_NAME=localhost' ./.env )
+	(cd docker-compose-eco-network; sed -i '/HOST_NAME/c\HOST_NAME=localhost' ./.env )
 fi
 
 if ((!$DISABLE_BUILD)); then
@@ -55,8 +55,9 @@ if (($DEV_MODE)); then
 	(cd docker-neo-csharp-nodes; ./docker_build.sh --neo-cli neo-cli-built.zip)
 fi
 
-echo "BUILDING/RUNNING Docker-compose with a set of components: Neo-CSharp-Nodes,NeoScan and Neo-Python";
-(cd dockers-neo-scan-neon; ./buildRun_Compose_PrivateNet_NeoScanDocker.sh)
+echo "STOPPPING/BUILDING/RUNNING Docker-compose with a set of components: Neo-CSharp-Nodes,NeoScan and Neo-Python";
+./stopEco_network.sh
+./runEco_network.sh
 
 echo "BUILDING/RUNNING web interface and compilers";
 ./buildCompilers_startWebInterface.sh
diff --git a/dockers-neo-scan-neon/docker-neo-scan/.env → docker-compose-eco-network/.env b/dockers-neo-scan-neon/docker-neo-scan/.env → docker-compose-eco-network/.env
diff --git a/...-neo-scan-neon/docker-neo-scan/.gitignore → docker-compose-eco-network/.gitignore b/...-neo-scan-neon/docker-neo-scan/.gitignore → docker-compose-eco-network/.gitignore
diff --git a/...n-neon/docker-neo-scan/custom-config.json → ...er-compose-eco-network/custom-config.json b/...n-neon/docker-neo-scan/custom-config.json → ...er-compose-eco-network/custom-config.json
diff --git a/...n-neon/docker-neo-scan/docker-compose.yml → ...er-compose-eco-network/docker-compose.yml b/...n-neon/docker-neo-scan/docker-compose.yml → ...er-compose-eco-network/docker-compose.yml
diff --git a/...-neon/docker-neo-scan/neo-scan/Dockerfile → docker-neo-scan/Dockerfile b/...-neon/docker-neo-scan/neo-scan/Dockerfile → docker-neo-scan/Dockerfile
diff --git a/...n/neo-scan/docker-compose-OldComposer.yml → ...r-neo-scan/docker-compose-OldComposer.yml b/...n/neo-scan/docker-compose-OldComposer.yml → ...r-neo-scan/docker-compose-OldComposer.yml
diff --git a/...docker-neo-scan/neo-scan/init-neo-scan.sh → docker-neo-scan/init-neo-scan.sh b/...docker-neo-scan/neo-scan/init-neo-scan.sh → docker-neo-scan/init-neo-scan.sh
diff --git a/...-scan/neo-scan/neo-scan-docker-startup.sh → docker-neo-scan/neo-scan-docker-startup.sh b/...-scan/neo-scan/neo-scan-docker-startup.sh → docker-neo-scan/neo-scan-docker-startup.sh
diff --git a/.../docker-neo-scan/neo-scan/neoscan_dev.exs → docker-neo-scan/neoscan_dev.exs b/.../docker-neo-scan/neo-scan/neoscan_dev.exs → docker-neo-scan/neoscan_dev.exs
diff --git a/...-scan/neo-scan/neoscan_monitor_config.exs → docker-neo-scan/neoscan_monitor_config.exs b/...-scan/neo-scan/neoscan_monitor_config.exs → docker-neo-scan/neoscan_monitor_config.exs
diff --git a/...neo-scan/neo-scan/neoscan_sync_config.exs → docker-neo-scan/neoscan_sync_config.exs b/...neo-scan/neo-scan/neoscan_sync_config.exs → docker-neo-scan/neoscan_sync_config.exs
diff --git a/dockers-neo-scan-neon/buildRun_Compose_PrivateNet_NeoScanDocker.sh b/dockers-neo-scan-neon/buildRun_Compose_PrivateNet_NeoScanDocker.sh
diff --git a/downEco_network.sh b/downEco_network.sh
diff --git a/run.sh b/run.sh
@@ -1,5 +1,2 @@
-#NPM Prune and Install before starting node backend
-./npm_prune_install.sh
-
 export COMMIT_GIT_VERSION=`git log --format="%H" -n 1`
 DEBUG=neocompiler:* PORT=8000 node app.js
diff --git a/runEco_network.sh b/runEco_network.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-(cd dockers-neo-scan-neon; ./buildRun_Compose_PrivateNet_NeoScanDocker.sh)
+(cd docker-compose-eco-network; docker-compose up -d)
diff --git a/stopEco_network.sh b/stopEco_network.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+(cd docker-compose-eco-network; docker-compose down)