Updated config for build 6b1a810a33

tech-bureau · May 8, 2020 · 1e53422 · 1e53422
1 parent cd96917
commit 1e53422
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/cmds/bootstrap/docker-compose.yml b/cmds/bootstrap/docker-compose.yml
@@ -42,7 +42,7 @@ services:
         ipv4_address: 172.20.0.10
 
   generate-raw-addresses:
-    image: techbureau/catapult-tools-private:gcc-master-8ff8de46c0
+    image: techbureau/catapult-tools-private:gcc-master-6b1a810a33
     command: bash -c "/bin-mount/generate-raw-addresses-if-needed 53 /addresses/raw-addresses.txt /addresses/addresses.yaml"
     volumes:
     - ../../bin/bash:/bin-mount
@@ -64,8 +64,8 @@ services:
     build:
       context: ../../ruby
       dockerfile: Dockerfile-dev
-#    command: bash -c "sleep infinity"
-    command: bash -c "/bin-mount/wait /addresses/addresses.yaml && /usr/app/bin/generate-and-write-configurations.rb /addresses/addresses.yaml /config-build /nemesis && touch /state/configs-generated"
+    command: bash -c "sleep infinity"
+#    command: bash -c "/bin-mount/wait /addresses/addresses.yaml && /usr/app/bin/generate-and-write-configurations.rb /addresses/addresses.yaml /config-build /nemesis && touch /state/configs-generated"
     volumes:
     - ../../bin/bash:/bin-mount
     - ../../ruby:/usr/app

diff --git a/cmds/bootstrap/dockerfiles/catapult/Dockerfile b/cmds/bootstrap/dockerfiles/catapult/Dockerfile
@@ -1,2 +1,2 @@
-FROM  techbureau/catapult-server-private:gcc-master-8ff8de46c0
+FROM  techbureau/catapult-server-private:gcc-master-6b1a810a33
 ADD ./userconfig /userconfig
diff --git a/cmds/bootstrap/dockerfiles/nemgen/Dockerfile b/cmds/bootstrap/dockerfiles/nemgen/Dockerfile
@@ -1,2 +1,2 @@
-FROM techbureau/catapult-tools-private:gcc-master-8ff8de46c0
+FROM techbureau/catapult-tools-private:gcc-master-6b1a810a33
 ADD ./userconfig /userconfig
diff --git a/ruby/Dockerfile-dev b/ruby/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM techbureau/catapult-tools-private:gcc-master-8ff8de46c0
+FROM techbureau/catapult-tools-private:gcc-master-6b1a810a33
 RUN apt update
 RUN apt install -y ruby
 # for debug
@@ -19,8 +19,4 @@ RUN bundle install
 # when dbugging this will be mounted
 RUN rm -rf /usr/app/*
 
-# TEMP
-COPY catapult.tools.linker /usr/catapult/bin/catapult.tools.linker
-RUN chmod 755 /usr/catapult/bin/catapult.tools.linker
-
 
diff --git a/ruby/catapult-templates/api_node/resources/config-network.properties.mt b/ruby/catapult-templates/api_node/resources/config-network.properties.mt
@@ -32,7 +32,10 @@ maxMosaicAtomicUnits = 9'000'000'000'000'000
 totalChainImportance = {{total_chain_importance}}
 minHarvesterBalance = 500
 maxHarvesterBalance = 50'000'000'000'000
+
 harvestBeneficiaryPercentage = 10
+harvestNetworkPercentage = 5
+harvestNetworkFeeSinkPublicKey = FF5563F1C5824EE0CD868799FBE8744B46D5549973FDA499939C952D951494E4
 
 blockPruneInterval = 360
 maxTransactionsPerBlock = 6'000

diff --git a/ruby/catapult-templates/peer_node/resources/config-network.properties.mt b/ruby/catapult-templates/peer_node/resources/config-network.properties.mt
@@ -32,7 +32,10 @@ maxMosaicAtomicUnits = 9'000'000'000'000'000
 totalChainImportance = {{{total_chain_importance}}}
 minHarvesterBalance = 500
 maxHarvesterBalance = 50'000'000'000'000
+
 harvestBeneficiaryPercentage = 10
+harvestNetworkPercentage = 5
+harvestNetworkFeeSinkPublicKey = FF5563F1C5824EE0CD868799FBE8744B46D5549973FDA499939C952D951494E4
 
 blockPruneInterval = 360
 maxTransactionsPerBlock = 6'000