Commit c7933998 authored by Mathieu Valois's avatar Mathieu Valois
Browse files

Merge branch 'gitlab-ci'

parents 73cbeeed 323ed6d4

.gitlab-ci.yml

+15 −4
Changes for .gitlab-ci.yml: 15 added lines, 4 removed lines.
Original line number Diff line number Diff line 
image: localhost:5000/stretch



before_script:

  - export http_proxy=http://10.14.128.99:3128

  - apt-get -qq update && apt-get -qq -y install build-essential > /dev/null

build:

  script: make -C Statsgen -j2

  - apt-get -qq update

  - apt-get -qq -y install build-essential > /dev/null



build-cli:

  script: make -C Statsgen -j$(nproc)

  artifacts:

    paths:

      - Statsgen/cstatsgen



build-gui:

  script:

    - cd GUI

    - qmake

    - make -j$(nproc)

  artifacts:

    paths:

      - GUI/GUI

Dockerfile

0 → 100644
+38 −0
Changes for Dockerfile: 38 added lines, 0 removed lines.
Original line number Diff line number Diff line 
# docker build . -t gui-statsgen

# docker run -d --name gsg -p 5022:22 gui-statsgen

# ssh -X -p 5022 root@127.0.0.1 /opt/GUI/GUI

FROM ubuntu:bionic



ENV SSH_PASSWORD "rootpass"



RUN apt-get -qq update

RUN apt-get -qq -y install build-essential \

                           qt5-default \

						   libqt5charts5-dev \

						   supervisor \

						   openssh-server \

						   >/dev/null



# Install SSH access

RUN mkdir /var/run/sshd

RUN echo "root:$SSH_PASSWORD" | chpasswd

RUN sed -i 's/^.*PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config

RUN echo "X11UseLocalhost no" >> /etc/ssh/sshd_config

RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd



# Configure supervisor

RUN mkdir -p /var/log/supervisor

RUN echo "[supervisord]" >> /etc/supervisor/conf.d/supervisord.conf

RUN echo "nodaemon=true" >> /etc/supervisor/conf.d/supervisord.conf

RUN echo "[program:sshd]" >> /etc/supervisor/conf.d/supervisord.conf

RUN echo "command=/usr/sbin/sshd -D" >> /etc/supervisor/conf.d/supervisord.conf



COPY GUI /opt/GUI



WORKDIR /opt/GUI

RUN qmake

RUN make -s -j$(nproc)



CMD [ "/usr/bin/supervisord", "-c",  "/etc/supervisor/conf.d/supervisord.conf" ]



EXPOSE 22

GUI/GUI.pro

+1 −1
Changes for GUI/GUI.pro: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ HEADERS += mainwindow.h\ 
FORMS    += mainwindow.ui





QMAKE_CXXFLAGS += -std=c++11 -lpthread
 
QMAKE_CXXFLAGS += -std=c++11 -lpthread -static

GUI/mainwindow.cpp

+1 −1
Changes for GUI/mainwindow.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ MainWindow::~MainWindow() 
/***************************************************/



void MainWindow::findFile() {

    QString filename = QFileDialog::getOpenFileName(this, tr("Browser"), QDir::currentPath(), tr("Text files (*.txt)"));

    QString filename = QFileDialog::getOpenFileName(this, tr("Browser"), QDir::currentPath(), tr("Text files (*.txt);; All Files (*)"));

    ui->fileLine->setText(filename);

}