From 8be89e9a25177b56cf986fbeee3a017e1c4c3ffa Mon Sep 17 00:00:00 2001
From: Dmitri Bogomolov <4glitch@gmail.com>
Date: Thu, 15 Oct 2020 16:22:03 +0300
Subject: [PATCH] Remove deb building overdocumentation

---
 Dockerfile | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 918f737d..6e665ff6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,43 +6,37 @@ RUN apt-get update
 
 # Install dependencies
 RUN apt-get install -yq --no-install-suggests --no-install-recommends \
-    python-msgpack dh-python python-all-dev build-essential libssl-dev \
-    python-stdeb fakeroot python-pip libcap-dev
+    build-essential libcap-dev libssl-dev \
+    python-all-dev python-msgpack python-pip python-setuptools
 
-RUN pip install --upgrade pip
+RUN pip2 install --upgrade pip
 
 EXPOSE 8444 8442
 
 ENV HOME /home/bitmessage
 ENV BITMESSAGE_HOME ${HOME}
 
-ENV VER 0.6.3.2
-
 WORKDIR ${HOME}
 ADD . ${HOME}
 
 # Install tests dependencies
-RUN pip install -r requirements.txt
-
-# Build and install deb
-RUN python2 setup.py sdist \
-  && py2dsc-deb dist/pybitmessage-${VER}.tar.gz \
-  && dpkg -i deb_dist/python-pybitmessage_${VER}-1_amd64.deb
+RUN pip2 install -r requirements.txt
+# Install
+RUN python2 setup.py install
 
 # Create a user
 RUN useradd bitmessage && chown -R bitmessage ${HOME}
 
 USER bitmessage
 
-# Generate default config
-RUN src/bitmessagemain.py -t && mv keys.dat /tmp
-
 # Clean HOME
 RUN rm -rf ${HOME}/*
 
+# Generate default config
+RUN pybitmessage -t
+
 # Setup environment
-RUN mv /tmp/keys.dat . \
-  && APIPASS=$(tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo) \
+RUN APIPASS=$(tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo) \
   && echo "\napiusername: api\napipassword: $APIPASS" \
   && echo "apienabled = true\napiinterface = 0.0.0.0\napiusername = api\napipassword = $APIPASS" >> keys.dat