Fix docker build

Dockerfile

@@ -4,7 +4,7 @@
 # $ docker build -t ngpost .
 # $ docker run -it -v $PWD/files:/root/files -v $PWD/ngPost.docker.conf:/root/.ngPost ngpost ARGUMENTS
 
-FROM debian:10
+FROM debian:10 as builder
 
 RUN sed -i 's/main$/main non-free/' /etc/apt/sources.list
 RUN apt-get update && apt-get install --no-install-recommends -y \
@@ -15,7 +15,18 @@ COPY . /usr/src/ngPost
 WORKDIR /usr/src/ngPost/src
 
 ENV QT_SELECT=qt5-x86_64-linux-gnu
-RUN git clean -fx && qmake && make -j$(nproc)
+RUN git clean -fx && qmake -o Makefile ngPost_cmd.pro && make -j$(nproc)
+RUN ln -s /usr/src/ngPost/src/ngPost /usr/local/bin/ngPost
+
+FROM debian:10
+
+RUN sed -i 's/main$/main non-free/' /etc/apt/sources.list
+RUN apt-get update && apt-get install --no-install-recommends -y \
+    par2 rar ca-certificates qt5-default \
+    && apt-get clean all \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /usr/src/ngPost /usr/src/ngPost
 RUN ln -s /usr/src/ngPost/src/ngPost /usr/local/bin/ngPost
 
 WORKDIR /root

src/ngPost_cmd.pro

@@ -1,160 +1,3 @@
-<<<<<<< HEAD
-QT += core network
-
-DEFINES += "APP_VERSION=\"4.16\""
-#CONFIG  += use_hmi
-
-INCLUDEPATH += $$PWD
-TARGET = ngPost
-TEMPLATE = app
-CONFIG += c++14
-CONFIG -= app_bundle
-
-
-use_hmi {
-    QT += gui
-    greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-    DEFINES += __USE_HMI__
-}
-else {
-    QT -= gui
-    CONFIG += console
-}
-
-DEFINES += __USE_CONNECTION_TIMEOUT__
-DEFINES += __COMPUTE_IMMEDIATE_SPEED__
-
-DEFINES += __USE_TMP_RAM__
-
-DEFINES += __RELEASE_ARTICLES_WHEN_CON_FAILS__
-
-
-# macro for debuging posting on multiple provides (no need anymore)
-#DEFINES -= __DISP_ARTICLE_SERVER__
-
-
-TRANSLATIONS = lang/ngPost_en.ts lang/ngPost_fr.ts lang/ngPost_es.ts lang/ngPost_de.ts\
-               lang/ngPost_nl.ts lang/ngPost_pt.ts lang/ngPost_zh.ts
-
-win32: {
-    RC_ICONS += ngPost.ico
-
-# we need the console to be able to print stuff in command line mode...
-# we hide the console if we start in GUI mode
-    CONFIG += console
-}
-
-macx: {
-    ICON = ngPost.icns
-    CONFIG += app_bundle
-    ExtraFiles.files = $$PWD/par2 $$PWD/parpar
-    ExtraFiles.path = Contents/MacOS
-    QMAKE_BUNDLE_DATA += ExtraFiles
-} 
-
-CONFIG(debug, debug|release) :{
-    DEFINES += __DEBUG__
-
-    DEFINES += LOG_CONNECTION_STEPS
-    DEFINES -= LOG_CONNECTION_ERRORS_BEFORE_EMIT_SIGNALS
-    DEFINES += LOG_NEWS_AUTH
-    DEFINES -= LOG_NEWS_DATA
-    DEFINES += LOG_CONSTRUCTORS    
-
-    DEFINES -= __SAVE_ARTICLES__
-}
-else {
-    # In release mode, remove all qDebugs !
-    DEFINES += QT_NO_DEBUG_OUTPUT
-}
-
-
-
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += \
-        ArticleBuilder.cpp \
-        FileUploader.cpp \
-        FoldersMonitorForNewFiles.cpp \
-        NgPost.cpp \
-        NntpCheckCon.cpp \
-        NntpConnection.cpp \
-        NzbCheck.cpp \
-        Poster.cpp \
-        PostingJob.cpp \
-        main.cpp \
-        nntp/Nntp.cpp \
-        nntp/NntpArticle.cpp \
-        nntp/NntpFile.cpp \
-        utils/CmdOrGuiApp.cpp \
-        utils/Yenc.cpp
-
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
-HEADERS += \
-    ArticleBuilder.h \
-    FileUploader.h \
-    FoldersMonitorForNewFiles.h \
-    NgPost.h \
-    NntpCheckCon.h \
-    NntpConnection.h \
-    NzbCheck.h \
-    Poster.h \
-    PostingJob.h \
-    nntp/Nntp.h \
-    nntp/NntpArticle.h \
-    nntp/NntpFile.h \
-    nntp/NntpServerParams.h \
-    utils/CmdOrGuiApp.h \
-    utils/Macros.h \
-    utils/PureStaticClass.h \
-    utils/Yenc.h
-
-
-
-RESOURCES += \
-    resources/resources.qrc
-
-
-use_hmi {
-SOURCES += \
-    hmi/AboutNgPost.cpp \
-    hmi/AutoPostWidget.cpp \
-    hmi/CheckBoxCenterWidget.cpp \
-    hmi/PostingWidget.cpp \
-    hmi/SignedListWidget.cpp \
-    hmi/MainWindow.cpp
-
-HEADERS += \
-    hmi/AboutNgPost.h \
-    hmi/AutoPostWidget.h \
-    hmi/CheckBoxCenterWidget.h \
-    hmi/PostingWidget.h \
-    hmi/SignedListWidget.h \
-    hmi/MainWindow.h
-
-FORMS += \
-    hmi/AboutNgPost.ui \
-    hmi/AutoPostWidget.ui \
-    hmi/MainWindow.ui \
-    hmi/PostingWidget.ui
-}
-=======
 QT -= gui
 CONFIG += console
 include(ngPost.pri)
->>>>>>> 99a046c8c058ff05d0fb9e7ff0b8063e09b4b97e