Merge branch 'master' into release

README.md

@@ -16,21 +16,28 @@ Linux: ![Linux CI](https://github.com/MisterTea/EternalTerminal/workflows/Linux%
 
 The easiest way to install is using Homebrew:
 
-	brew install MisterTea/et/et
+```
+brew install MisterTea/et/et
+```
 
 Alternatively, a package is available in MacPorts:
 
-	sudo port install et
+```
+sudo port install et
+```
 
 ### Ubuntu
 
 For Ubuntu, use our PPA:
 
-	sudo add-apt-repository ppa:jgmath2000/et
-	sudo apt-get update
-	sudo apt-get install et
+```
+sudo add-apt-repository ppa:jgmath2000/et
+sudo apt-get update
+sudo apt-get install et
+```
 
 Install and build from source:
+
 ```
 sudo apt install build-essential libgflags-dev libprotobuf-dev protobuf-compiler libsodium-dev cmake git
 git clone --recurse-submodules https://github.com/MisterTea/EternalTerminal.git
@@ -41,29 +48,40 @@ cmake ../
 make && sudo make install
 sudo cp ../etc/et.cfg /etc/
 ```
+
 Once built, the binary only requires `libgflags-dev` and `libprotobuf-dev`.
 
 ### Debian
 
 For debian, use our deb repo. For buster:
 
-	echo "deb https://github.com/MisterTea/debian-et/raw/master/debian-source/ buster main" | sudo tee -a /etc/apt/sources.list
-	curl -sSL https://github.com/MisterTea/debian-et/raw/master/et.gpg | sudo apt-key add -
-	sudo apt update
-	sudo apt install et
-
+```
+echo "deb https://github.com/MisterTea/debian-et/raw/master/debian-source/ buster main" | sudo tee -a /etc/apt/sources.list
+curl -sSL https://github.com/MisterTea/debian-et/raw/master/et.gpg | sudo apt-key add -
+sudo apt update
+sudo apt install et
+```
 
 ### CentOS 7
 
-Up to the present day the only way to install is to [build from source](#centos-7).
+Up to the present day the only way to install is to [build from source](#centos-7-1).
+
+### CentOS 8
 
+```
+sudo dnf install epel-release
+sudo dnf install et
+```
 
 ### FreeBSD
 On FreeBSD, use:
 
-	pkg install eternalterminal
+```
+pkg install eternalterminal
+```
 
 ### Fedora (version 29 and later):
+
 ```
 sudo dnf install et
 ```
@@ -82,28 +100,38 @@ Install dependencies:
 
 * Fedora (tested on 25):
 
-      sudo dnf install boost-devel libsodium-devel ncurses-devel protobuf-devel \
-	protobuf-compiler cmake gflags-devel
+  ```
+  sudo dnf install boost-devel libsodium-devel ncurses-devel protobuf-devel \
+  	protobuf-compiler cmake gflags-devel
+  ```
 
 * Gentoo:
 
-      sudo emerge dev-libs/boost dev-libs/libsodium sys-libs/ncurses \
-	dev-libs/protobuf dev-util/cmake dev-cpp/gflags
+  ```
+  sudo emerge dev-libs/boost dev-libs/libsodium sys-libs/ncurses \
+  	dev-libs/protobuf dev-util/cmake dev-cpp/gflag
+  ```
 
 Download and install from source:
 
-	git clone --recurse-submodules https://github.com/MisterTea/EternalTerminal.git
-	cd EternalTerminal
-	mkdir build
-	cd build
-	cmake ../
-	make
-	sudo make install
+```
+git clone --recurse-submodules https://github.com/MisterTea/EternalTerminal.git
+cd EternalTerminal
+mkdir build
+cd build
+cmake ../
+make
+sudo make install
+```
 
 ### Windows
 
 Eternal Terminal works under WSL (Windows Subsystem for Linux).  Follow the ubuntu instructions.
 
+### Docker Image
+
+See [docker/README.md](docker/)
+
 ## Verifying
 
 Verify that the client is installed correctly by looking for the `et` executable: `which et`.
@@ -179,7 +207,7 @@ Grab the deps and then follow this process:
 Debian/Ubuntu Dependencies:
 ```
 sudo apt install libboost-dev libsodium-dev libncurses5-dev \
-     libprotobuf-dev protobuf-compiler cmake libgflags-dev libutempter-dev cmake git
+	libprotobuf-dev protobuf-compiler cmake libgflags-dev libutempter-dev cmake git
 ```
 
 Source and setup:
@@ -247,6 +275,10 @@ Start the et service:
 sudo systemctl enable --now et.service
 ```
 
+## Building using Docker
+
+Builder Dockerfiles are located at [deployment/](deployment/). Supported OSes: CentOS 8, openSUSE and Ubuntu.
+
 ## Reporting issues
 
 If you have any problems with installation or usage, please [file an issue on github](https://github.com/MisterTea/EternalTerminal/issues).

deployment/centos.Dockerfile

@@ -8,23 +8,18 @@ COPY id_rsa.pub .ssh/
 RUN chmod 0400 .ssh/id_rsa
 
 RUN dnf -y install dnf-plugins-core
-RUN yum update -y
-RUN yum groupinstall -y "Development Tools"
-RUN yum install -y epel-release
+RUN dnf update -y
+RUN dnf groupinstall -y "Development Tools"
+RUN dnf install -y epel-release
 RUN dnf config-manager --set-enabled PowerTools
-RUN yum install --nogpgcheck -y openssh-server cmake3 gcc-c++ protobuf-devel libsodium-devel
+RUN dnf install --nogpgcheck -y openssh-server cmake3 gcc-c++ protobuf-devel libsodium-devel
 RUN alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 \
     --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 \
     --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 \
     --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 \
     --family cmake
 
-RUN git config --global user.email "[email protected]"
-RUN git config --global user.name "Jason Gauci"
-
-RUN echo -e "StrictHostKeyChecking no\n" >> ~/.ssh/config
-
-RUN git clone --branch release [email protected]:MisterTea/EternalTerminal.git
+RUN git clone --branch release https://github.com/MisterTea/EternalTerminal.git
 RUN mkdir -p EternalTerminal/build
 WORKDIR /root/EternalTerminal/build
 RUN cmake -DFULL_PROTOBUF=ON ..

deployment/opensuse.Dockerfile

@@ -10,8 +10,4 @@ COPY .gnupg .gnupg
 RUN zypper --non-interactive install -t pattern devel_C_C++
 RUN zypper --non-interactive install git openssh cmake gcc-c++ protobuf-devel libsodium-devel
 
-RUN git config --global user.email "[email protected]"
-RUN git config --global user.name "Jason Gauci"
-
-RUN ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN git clone --branch release [email protected]:MisterTea/EternalTerminal.git
+RUN git clone --branch release https://github.com/MisterTea/EternalTerminal.git

deployment/ubuntu.Dockerfile

@@ -12,10 +12,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt update && apt upgrade -y && apt install -y distro-info build-essential git devscripts ubuntu-dev-tools aptly dput jq libsodium-dev libprotobuf-dev protobuf-compiler cmake libutempter-dev debhelper dh-systemd
 
-RUN git config --global user.email "[email protected]"
-RUN git config --global user.name "Jason Gauci"
-
-RUN ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN git clone --branch release [email protected]:MisterTea/EternalTerminal.git
+RUN git clone --branch release https://github.com/MisterTea/EternalTerminal.git
 
 COPY ubuntu/deploy_ubuntu_ppa.sh .

src/terminal/TerminalClientMain.cpp

@@ -24,6 +24,7 @@ int main(int argc, char** argv) {
 
   // Setup easylogging configurations
   el::Configurations defaultConf = LogHandler::setupLogHandler(&argc, &argv);
+  LogHandler::setupStdoutLogger();
 
   // Parse command line arguments
   cxxopts::Options options("et", "Remote shell for the busy and impatient");
@@ -103,8 +104,6 @@ int main(int argc, char** argv) {
     // set thread name
     el::Helpers::setThreadName("client-main");
 
-    LogHandler::setupStdoutLogger();
-
     // Install log rotation callback
     el::Helpers::installPreRollOutCallback(LogHandler::rolloutHandler);
 

src/terminal/TerminalMain.cpp

@@ -20,6 +20,7 @@ void setDaemonLogFile(string idpasskey, string daemonType) {
 int main(int argc, char** argv) {
   // Setup easylogging configurations
   el::Configurations defaultConf = LogHandler::setupLogHandler(&argc, &argv);
+  LogHandler::setupStdoutLogger();
 
   // Parse command line arguments
   cxxopts::Options options("et", "Remote shell for the busy and impatient");
@@ -148,8 +149,6 @@ int main(int argc, char** argv) {
       // Install log rotation callback
       el::Helpers::installPreRollOutCallback(LogHandler::rolloutHandler);
 
-      LogHandler::setupStdoutLogger();
-
       CLOG(INFO, "stdout") << "IDPASSKEY:" << idpasskey << endl;
       if (DaemonCreator::createSessionLeader() == -1) {
         STFATAL << "Error creating daemon: " << strerror(errno);
@@ -183,8 +182,6 @@ int main(int argc, char** argv) {
     // Install log rotation callback
     el::Helpers::installPreRollOutCallback(LogHandler::rolloutHandler);
 
-    LogHandler::setupStdoutLogger();
-
     SocketEndpoint routerEndpoint;
     routerEndpoint.set_name(result["serverfifo"].as<string>());
     UserTerminalHandler uth(ipcSocketHandler, term, true, routerEndpoint,

src/terminal/TerminalServerMain.cpp

@@ -9,6 +9,7 @@ using namespace gflags;
 int main(int argc, char **argv) {
   // Setup easylogging configurations
   el::Configurations defaultConf = LogHandler::setupLogHandler(&argc, &argv);
+  LogHandler::setupStdoutLogger();
 
   cxxopts::Options options("etserver",
                            "Remote shell for the busy and impatient");
@@ -137,8 +138,6 @@ int main(int argc, char **argv) {
     // Install log rotation callback
     el::Helpers::installPreRollOutCallback(LogHandler::rolloutHandler);
 
-    LogHandler::setupStdoutLogger();
-
     std::shared_ptr<SocketHandler> tcpSocketHandler(new TcpSocketHandler());
     std::shared_ptr<PipeSocketHandler> pipeSocketHandler(
         new PipeSocketHandler());

test/Main.cpp

@@ -9,6 +9,7 @@ int main(int argc, char **argv) {
   // Setup easylogging configurations
   el::Configurations defaultConf =
       et::LogHandler::setupLogHandler(&argc, &argv);
+  et::LogHandler::setupStdoutLogger();
   defaultConf.setGlobally(el::ConfigurationType::ToStandardOutput, "true");
   defaultConf.setGlobally(el::ConfigurationType::ToFile, "true");
   // el::Loggers::setVerboseLevel(9);
@@ -22,8 +23,6 @@ int main(int argc, char **argv) {
   // Reconfigure default logger to apply settings above
   el::Loggers::reconfigureLogger("default", defaultConf);
 
-  et::LogHandler::setupStdoutLogger();
-
   int result = Catch::Session().run(argc, argv);
 
   FATAL_FAIL(::remove(logPath.c_str()));