diff --git a/app/Main.hs b/app/Main.hs index a652534..2d1d731 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -221,7 +221,7 @@ main = do " ______ _ _ _ \n |___ / (_) | | | \n / / ___ _ __ _| |_| |__ \n / / / _ \\ '_ \\| | __| '_ \\ \n / /_| __/ | | | | |_| | | |\n /_____\\___|_| |_|_|\\__|_| |_|\n Zcash Full Node CLI v0.4.0" } (root nodeUser nodePwd) - "cli" -> runZenithCLI myConfig + "tui" -> runZenithCLI myConfig "gui" -> runZenithGUI myConfig "rescan" -> clearSync myConfig _ -> printUsage @@ -232,5 +232,6 @@ printUsage = do putStrLn "zenith [command] [parameters]\n" putStrLn "Available commands:" putStrLn "legacy\tLegacy CLI for zcashd" - putStrLn "cli\tCLI for zebrad" + putStrLn "tui\tTUI for zebrad" + putStrLn "gui\tGUI for zebrad" putStrLn "rescan\tRescan the existing wallet(s)" diff --git a/docker_files/Dockerfile b/docker_files/Dockerfile index 35d6173..f760f6f 100644 --- a/docker_files/Dockerfile +++ b/docker_files/Dockerfile @@ -7,30 +7,40 @@ RUN apt update ENV DEBIAN_FRONTEND=noninteractive # Update the package list and install necessary packages -RUN apt-get update && apt-get install -y \ - sudo \ +RUN apt-get install -y \ xfce4 \ xfce4-goodies \ - x11vnc \ - xvfb \ - novnc \ - net-tools \ - curl \ - wget \ - vim \ - git + tigervnc-standalone-server \ + tigervnc-common \ + xfonts-base \ + xterm \ + wget RUN apt-get install -y \ libxss-dev \ libxrandr-dev \ - libsecp256k1-dev \ - xclip + libsecp256k1-dev \ + xclip \ + libglew-dev \ + libsdl2-dev RUN apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN mkdir /home/zenith -RUN useradd -ms /bin/bash zenusr +# Create a new user (e.g., "zenusr") and set a password +RUN useradd -ms /bin/bash zenusr +RUN echo "1234\n1234\n" | passwd zenusr +RUN usermod -aG sudo zenusr + +# Configure VNC server +RUN mkdir -p /home/zenusr/.vnc +RUN echo "vnc1234" | vncpasswd -f > /home/zenusr/.vnc/passwd +RUN chmod 600 /home/zenusr/.vnc/passwd + +# Create startup script for VNC seriver +RUN echo -e '#!/bin/bash\nxrdb $HOME/.Xresources\nstartxfce4 &' > /home/zenusr/.vnc/xstartup +RUN chmod +x /home/zenusr/.vnc/xstartup +RUN chown zenusr:zenusr -R /home/zenusr/.vnc COPY bash_rc_adm /root/.bashrc COPY bash_rc_usr /home/zenusr/.bashrc @@ -38,5 +48,21 @@ COPY zenith /usr/local/bin COPY librustzcash_wrapper.so /usr/local/lib COPY sapling-spend.params /usr/local/lib COPY sapling-output.params /usr/local/lib +COPY libc-bin_2.38-1ubuntu6_amd64.deb /home/zenusr/Downloads/ +COPY libc-dev-bin_2.38-1ubuntu6_amd64.deb /home/zenusr/Downloads/ +COPY libc6_2.38-1ubuntu6_amd64.deb /home/zenusr/Downloads/ + +RUN echo -e '#!/bin/bash\ncd /home/zenusr/Downloads\ndpkg -i libc6_2.38-1ubuntu6_amd64.deb libc-bin_2.38-1ubuntu6_amd64.deb libc-dev-bin_2.38-1ubuntu6_amd64.deb' > /usr/local/bin/updlibc +RUN chmod +x /usr/local/bin/updlibc +RUN updlibc + +RUN echo -e '#!/bin/bash\nvncserver -geometry 1360x768 -depth 24' > /usr/local/bin/startvnc +RUN chmod +x /usr/local/bin/startvnc + +# Set the user to "zenusr" +USER zenusr +WORKDIR /home/zenusr +ENV USER=zenusr + CMD ["/bin/bash"] diff --git a/docker_files/Dockerfile_tightvnc b/docker_files/Dockerfile_tightvnc new file mode 100644 index 0000000..a34b898 --- /dev/null +++ b/docker_files/Dockerfile_tightvnc @@ -0,0 +1,69 @@ +FROM ubuntu:22.04 +MAINTAINER Rene V. Vergara A. + +RUN apt update + +# Set environment variables to non-interactive mode for installation +ENV DEBIAN_FRONTEND=noninteractive + +# Update the package list and install necessary packages +RUN apt-get install -y \ + xfce4 \ + xfce4-goodies \ + tightvncserver \ + xterm \ + wget + +# Install your GUI application (example: Firefox) +# RUN apt-get install -y firefox + +RUN apt-get install -y \ + libxss-dev \ + libxrandr-dev \ + libsecp256k1-dev \ + xclip \ + libglew-dev \ + libsdl2-dev + +RUN apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +# Create a new user (e.g., "zenusr") and set a password +RUN useradd -ms /bin/bash zenusr +RUN echo "1234\n1234\n" | passwd zenusr +RUN usermod -aG sudo zenusr + +# Configure VNC server +RUN mkdir -p /home/zenusr/.vnc +RUN echo "vnc1234" | vncpasswd -f > /home/zenusr/.vnc/passwd +RUN chmod 600 /home/zenusr/.vnc/passwd + +# Create startup script for VNC seriver +RUN echo -e '#!/bin/bash\nxrdb $HOME/.Xresources\nstartxfce4 &' > /home/zenusr/.vnc/xstartup +RUN chmod +x /home/zenusr/.vnc/xstartup +RUN chown zenusr:zenusr -R /home/zenusr/.vnc + +COPY bash_rc_adm /root/.bashrc +COPY bash_rc_usr /home/zenusr/.bashrc +COPY zenith /usr/local/bin +COPY librustzcash_wrapper.so /usr/local/lib +COPY sapling-spend.params /usr/local/lib +COPY sapling-output.params /usr/local/lib +COPY libc-bin_2.38-1ubuntu6_amd64.deb /home/zenusr/Downloads/ +COPY libc-dev-bin_2.38-1ubuntu6_amd64.deb /home/zenusr/Downloads/ +COPY libc6_2.38-1ubuntu6_amd64.deb /home/zenusr/Downloads/ + +RUN echo -e '#!/bin/bash\ncd /home/zenusr/Downloads\ndpkg -i libc6_2.38-1ubuntu6_amd64.deb libc-bin_2.38-1ubuntu6_amd64.deb libc-dev-bin_2.38-1ubuntu6_amd64.deb' > /usr/local/bin/updlibc +RUN chmod +x /usr/local/bin/updlibc +RUN updlibc + +RUN echo -e '#!/bin/bash\nvncserver -geometry 1360x768 -depth 24' > /usr/local/bin/startvnc +RUN chmod +x /usr/local/bin/startvnc + +# Set the user to "zenusr" +USER zenusr +WORKDIR /home/zenusr +ENV USER=zenusr + + +CMD ["/bin/bash"] diff --git a/docker_files/libc-bin_2.38-1ubuntu6_amd64.deb b/docker_files/libc-bin_2.38-1ubuntu6_amd64.deb new file mode 100644 index 0000000..2bf823c Binary files /dev/null and b/docker_files/libc-bin_2.38-1ubuntu6_amd64.deb differ diff --git a/docker_files/libc-dev-bin_2.38-1ubuntu6_amd64.deb b/docker_files/libc-dev-bin_2.38-1ubuntu6_amd64.deb new file mode 100644 index 0000000..1cd9e75 Binary files /dev/null and b/docker_files/libc-dev-bin_2.38-1ubuntu6_amd64.deb differ diff --git a/docker_files/libc6_2.38-1ubuntu6_amd64.deb b/docker_files/libc6_2.38-1ubuntu6_amd64.deb new file mode 100644 index 0000000..dd1f34e Binary files /dev/null and b/docker_files/libc6_2.38-1ubuntu6_amd64.deb differ diff --git a/docker_files/runzenith b/docker_files/runzenith index 4c7dfef..b3a4842 100755 --- a/docker_files/runzenith +++ b/docker_files/runzenith @@ -1,5 +1,5 @@ #!/bin/bash -ZFOLDER=~/Public/zenith +ZFOLDER=~/Zenith IMAGE_NAME=zenith-docker-gui:0.5.3.0 # Check if data folder exists diff --git a/docker_files/zenith b/docker_files/zenith index 10c1810..1c0d096 100755 Binary files a/docker_files/zenith and b/docker_files/zenith differ