From 85f717b6fc5dcd59f98ef6c7ad9af8566f2f3285 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Fri, 10 May 2024 14:27:55 +0200
Subject: [PATCH] Refactored

---
 Dockerfile | 32 +++++++++++---------------------
 app/app.sh | 16 ++++++----------
 bash.sh    |  6 +-----
 run.sh     |  3 +--
 4 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 30fe0d5..93616db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,20 @@
 # syntax=docker/dockerfile:1
 FROM ubuntu:jammy as base
 
-WORKDIR /app
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
+RUN apt-get upgrade
 
-# Build tools
-RUN apt-get install -y git build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils
-
-# Boost libs
+# Required dependencies
+RUN apt-get install -y build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils
 RUN apt-get install -y libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev
 
 # Qt (required for dogecoin-qt GUI)
-RUN apt-get install -y libqt5gui5 libqt5core5a libqt5dbus5
-RUN apt-get install -y qttools5-dev qttools5-dev-tools
-
-# Protobuf libs
-RUN apt-get install -y libprotobuf-dev
-# Protobuf compiler
-RUN apt-get install -y protobuf-compiler
-
-# QR encode libs
+RUN apt-get install -y libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler
 RUN apt-get install -y libqrencode-dev
 
+RUN apt-get install -y libxkbcommon-x11-0 libxcb-xinerama0 libx11-xcb1 libx11-xcb-dev libqt5x11extras5
+
 # BerkeleyDB (version 5.3)
 RUN apt-get install -y libdb5.3++-dev libdb5.3++ libdb5.3-dev
 
@@ -30,20 +22,18 @@ RUN apt-get install -y libdb5.3++-dev libdb5.3++ libdb5.3-dev
 RUN apt-get install -y libzmq3-dev
 
 # Miniupnpc
-RUN apt-get install -y libminiupnpc-dev
-
-# Make and autogen
-RUN apt-get install -y autogen
-RUN apt-get install -y make
+# RUN apt-get install -y libminiupnpc-dev
 
+# Build tools
+RUN apt-get install -y git autogen make gawk file
 # -------------------------------------
 FROM base as sources
 ADD https://github.com/dogecoin/dogecoin.git /tmp/dogecoin
 
 FROM sources as conf
 WORKDIR "/tmp/dogecoin"
-RUN ./autogen.sh
-RUN ./configure --with-gui
+RUN ./autogen.sh >autogen.log
+RUN ./configure --with-gui >configure.log
 
 FROM conf as make
 WORKDIR "/tmp/dogecoin"
diff --git a/app/app.sh b/app/app.sh
index 5b859f9..50157c2 100755
--- a/app/app.sh
+++ b/app/app.sh
@@ -1,13 +1,9 @@
 #!/bin/bash
 
-bail()
-{
-  while true; do
-    sleep 1
-  done;
-}
-
 echo Using DISPLAY $DISPLAY
-exec dogecoin-qt
-
-bail
+export XDG_RUNTIME_DIR=/tmp/runtime-doge
+#export QT_QPA_PLATFORM=offscreen
+#export QT_X11_NO_MITSHM=1
+export QT_DEBUG_PLUGINS=1
+#exec dogecoin-qt
+exec bash --login
diff --git a/bash.sh b/bash.sh
index cd1d8bb..db62892 100755
--- a/bash.sh
+++ b/bash.sh
@@ -1,8 +1,4 @@
 #/bin/bash
 
 # Run container interactive with X11
-# User doge
-#docker container run --rm --net host -e DISPLAY=:0 -v /tmp/.X11-unix:/tmp/.X11-unix -v /home/jens/.dogecoin:/home/doge/.dogecoin --user doge -it dogecoin bash --login
-# User root
-docker run --rm --net host -e DISPLAY=:0 -v /tmp/.X11-unix:/tmp/.X11-unix -v /home/jens/.dogecoin:/home/doge/.dogecoin -it dogecoin bash --login
-#docker run --rm --net bridge -e DISPLAY=172.17.0.2:99 -v /home/jens/.dogecoin:/home/doge/.dogecoin -it dogecoin bash --login
+docker container run --rm --net bridge -e DISPLAY=$DISPLAY -v /home/jens/.dogecoin:/home/doge/.dogecoin -it dogecoin bash --login
diff --git a/run.sh b/run.sh
index 010c6b7..662a7f8 100755
--- a/run.sh
+++ b/run.sh
@@ -1,5 +1,4 @@
 #/bin/bash
 
 # Run container interactive with X11
-#docker container run --rm --net host -e DISPLAY=:0 -v /tmp/.X11-unix:/tmp/.X11-unix -v /home/jens/.dogecoin:/home/doge/.dogecoin --user doge -it dogecoin dogecoin-qt
-docker container run --rm --net bridge -e DISPLAY=$DISPLAY -v /home/jens/.dogecoin:/home/doge/.dogecoin --user doge dogecoin
+docker container run --rm --net bridge -e DISPLAY=$DISPLAY -v /home/jens/.dogecoin:/home/doge/.dogecoin --user doge -it dogecoin