Loading .gitlab-ci.yml +16 −16 Original line number Diff line number Diff line image: localhost:5000/stretch image: ubuntu:bionic build-cli: before_script: - apt-get -qq update - apt-get -qq -y install build-essential > /dev/null script: make -C Statsgen -j$(nproc) cpack - apt-get -qq -y install build-essential script: make -j$(nproc) cppack artifacts: paths: - Statsgen/cpack - cppack # build-gui: # before_script: # - apt-get -qq update # - apt-get -qq -y install build-essential \ # qt5-default \ # libqt5charts5-dev \ # supervisor \ # openssh-server > /dev/null # script: make -C Statsgen -j$(nproc) cpack-gui # artifacts: # paths: # - Statsgen/cpack-gui build-gui: before_script: - apt-get -qq update - apt-get -qq -y install build-essential qt5-default libqt5charts5-dev supervisor openssh-server script: make -j$(nproc) cppack-gui artifacts: paths: - cppack-gui Dockerfile +5 −5 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/Statsgen/cstatsgen-gui # docker build . -t cppack # docker run -d --name gsg -p 5022:22 cppack # ssh -X -p 5022 root@127.0.0.1 /opt/cppack/cppack-gui FROM ubuntu:bionic ENV SSH_PASSWORD "rootpass" Loading Loading @@ -28,9 +28,9 @@ RUN mkdir -p /var/log/supervisor && \ echo "[program:sshd]" >> /etc/supervisor/conf.d/supervisord.conf && \ echo "command=/usr/sbin/sshd -D" >> /etc/supervisor/conf.d/supervisord.conf COPY Statsgen /opt/Statsgen COPY . /opt/cppack WORKDIR /opt/Statsgen WORKDIR /opt/cppack RUN make -s CMD [ "/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf" ] Loading Loading
.gitlab-ci.yml +16 −16 Original line number Diff line number Diff line image: localhost:5000/stretch image: ubuntu:bionic build-cli: before_script: - apt-get -qq update - apt-get -qq -y install build-essential > /dev/null script: make -C Statsgen -j$(nproc) cpack - apt-get -qq -y install build-essential script: make -j$(nproc) cppack artifacts: paths: - Statsgen/cpack - cppack # build-gui: # before_script: # - apt-get -qq update # - apt-get -qq -y install build-essential \ # qt5-default \ # libqt5charts5-dev \ # supervisor \ # openssh-server > /dev/null # script: make -C Statsgen -j$(nproc) cpack-gui # artifacts: # paths: # - Statsgen/cpack-gui build-gui: before_script: - apt-get -qq update - apt-get -qq -y install build-essential qt5-default libqt5charts5-dev supervisor openssh-server script: make -j$(nproc) cppack-gui artifacts: paths: - cppack-gui
Dockerfile +5 −5 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/Statsgen/cstatsgen-gui # docker build . -t cppack # docker run -d --name gsg -p 5022:22 cppack # ssh -X -p 5022 root@127.0.0.1 /opt/cppack/cppack-gui FROM ubuntu:bionic ENV SSH_PASSWORD "rootpass" Loading Loading @@ -28,9 +28,9 @@ RUN mkdir -p /var/log/supervisor && \ echo "[program:sshd]" >> /etc/supervisor/conf.d/supervisord.conf && \ echo "command=/usr/sbin/sshd -D" >> /etc/supervisor/conf.d/supervisord.conf COPY Statsgen /opt/Statsgen COPY . /opt/cppack WORKDIR /opt/Statsgen WORKDIR /opt/cppack RUN make -s CMD [ "/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf" ] Loading