Docker stuff again

diff --git a/Dockerfile b/Dockerfile
index 37efb1c0e3ca284a0ecd0995d123df84326803f1..71136b3aff4b9e5cdaf1c53c7e57c9d882270bf7 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,5 @@
-FROM ubuntu:16.04
-MAINTAINER Mihail Fedorov <[email protected]>
-
-# All the stuff
-# And clean out packages, keep space minimal
-RUN apt-get -y update && \
-    apt-get -y upgrade && \
-    apt-get -y install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev \
-    unzip python zlib1g-dev wget bsdmainutils automake libboost-all-dev libssl-dev libprotobuf-dev \
-    protobuf-compiler libqt4-dev libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+FROM kolobus/ubuntu:komodo
+MAINTAINER Mihail Fedorov <[email protected]>
 
 ADD ./ /komodo
 ENV HOME /komodo
@@ -19,7 +9,7 @@ WORKDIR /komodo
 RUN cd /komodo && \
     ./autogen.sh && \
     ./configure --with-incompatible-bdb --with-gui || true && \
-    ./zcutil/build.sh -j4
+    ./zcutil/build.sh -j$(nproc)
 
 # Unknown stuff goes here
 
@@ -28,4 +18,3 @@ RUN ln -sf /komodo/src/komodod /usr/bin/komodod && \
     ln -sf /komodo/zcutil/docker-komodo-cli.sh /usr/bin/komodo-cli
 
 CMD ["entrypoint"]
-

diff --git a/zcutil/docker-entrypoint.sh b/zcutil/docker-entrypoint.sh
index c7df89d70a0d6436ff4441bcea314e46a92630bd..aae6fc7e443caa19d8a229ed40aff6444a2befaf 100755 (executable)
--- a/zcutil/docker-entrypoint.sh
+++ b/zcutil/docker-entrypoint.sh
@@ -14,12 +14,6 @@ rpcpassword=${rpcpassword:-`dd if=/dev/urandom bs=33 count=1 2>/dev/null | base6
 txindex=1
 bind=${listenip:-127.0.0.1}
 rpcbind=${listenip:-127.0.0.1}
-addnode=5.9.102.210
-addnode=78.47.196.146
-addnode=178.63.69.164
-addnode=88.198.65.74
-addnode=5.9.122.241
-addnode=144.76.94.38
 EOF
 
     cat $HOME/.komodo/komodo.conf
@@ -27,9 +21,10 @@ fi
 
 echo "...Checking fetch-params"
 $HOME/zcutil/fetch-params.sh
-
 echo "Initialization completed successfully"
 echo
+
+# ToDo: Needs some rework. I was sick
 if [ $# -gt 0 ]; then
 
     args=("$@")

diff --git a/zcutil/docker-komodo-cli.sh b/zcutil/docker-komodo-cli.sh
index 3b555725fb48e2305b378cbb6c2df38c69a21520..121587bdf54a1d982884845598156df8be750076 100755 (executable)
--- a/zcutil/docker-komodo-cli.sh
+++ b/zcutil/docker-komodo-cli.sh
@@ -1,11 +1,6 @@
 #!/bin/bash
-if [  -z ${assetchain+x} ]; then
 
-    /komodo/src/komodo-cli $1 $2 $3 $4
+# ToDo: check for docker arg ac_name
 
-else
-
-    /komodo/src/komodo-cli -ac_name=$assetchain $1 $2 $3 $4
-
-fi
+/komodo/src/komodo-cli $1 $2 $3 $4