Skip to content

Commit 466a0f2

Browse files
Nelson-numerical-softwareNelson-numerical-software
committed
use ubuntu 22.04 as long term support
1 parent 0c0fa7e commit 466a0f2

File tree

2 files changed

+74
-59
lines changed

2 files changed

+74
-59
lines changed

‎Dockerfile

Lines changed: 72 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,103 @@
11
#==============================================================================
22
# Copyright (c) 2016-present Allan CORNET (Nelson)
33
#==============================================================================
4-
# This file is part of the Nelson.
5-
#=============================================================================
64
# LICENCE_BLOCK_BEGIN
7-
# SPDX-License-Identifier: LGPL-3.0-or-later
5+
# This program is free software: you can redistribute it and/or modify
6+
# it under the terms of the GNU General Public License as published by
7+
# the Free Software Foundation, either version 2 of the License, or
8+
# (at your option) any later version.
9+
#
10+
# This program is distributed in the hope that it will be useful,
11+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
# GNU General Public License for more details.
14+
#
15+
# You should have received a copy of the GNU General Public License
16+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
817
# LICENCE_BLOCK_END
918
#==============================================================================
1019

11-
FROM debian:bullseye-slim
20+
FROM ubuntu:22.04
1221
LABEL maintainer="Allan CORNET [email protected]"
1322

14-
RUN apt-get update
15-
RUN apt-get install -y build-essential;
16-
RUN apt-get install -y autotools-dev;
17-
RUN apt-get install -y libtool;
18-
RUN apt-get install -y automake;
19-
RUN apt-get install -y xvfb;
20-
RUN apt-get install -y git;
21-
RUN apt-get install -y libboost-all-dev;
22-
RUN apt-get install -y libopenmpi-dev;
23-
RUN apt-get install -y openmpi-bin;
24-
RUN apt-get install -y gettext;
25-
RUN apt-get install -y pkg-config;
26-
RUN apt-get install -y cmake;
27-
RUN apt-get install -y libffi-dev;
28-
RUN apt-get install -y libicu-dev;
29-
RUN apt-get install -y libxml2-dev;
30-
RUN apt-get install -y liblapack-dev;
31-
RUN apt-get install -y liblapacke-dev;
32-
RUN apt-get install -y fftw3;
33-
RUN apt-get install -y fftw3-dev;
34-
RUN apt-get install -y libasound-dev;
35-
RUN apt-get install -y portaudio19-dev;
36-
RUN apt-get install -y libsndfile1-dev;
37-
RUN apt-get install -y libtag1-dev;
38-
RUN apt-get install -y alsa-utils;
39-
RUN apt-get install -y libhdf5-dev;
40-
RUN apt-get install -y hdf5-tools;
41-
RUN apt-get install -y libmatio-dev;
42-
RUN apt-get install -y libslicot0;
43-
RUN apt-get install -y zlib1g-dev;
44-
RUN apt-get install -y libcurl4-openssl-dev;
45-
RUN apt-get install -y libgit2-dev;
46-
RUN apt-get install -y libeigen3-dev;
47-
RUN apt-get install -y qtbase5-dev;
48-
RUN apt-get install -y qtdeclarative5-dev;
49-
RUN apt-get install -y libqt5webkit5-dev;
50-
RUN apt-get install -y qtbase5-private-dev;
51-
RUN apt-get install -y qtdeclarative5-dev;
52-
RUN apt-get install -y qml-module-qtquick-controls;
53-
RUN apt-get install -y qml-module-qtquick-dialogs;
54-
RUN apt-get install -y qttools5-dev;
55-
RUN apt-get install -y qttools5-dev-tools;
56-
RUN apt-get install -y libqt5opengl5-dev;
57-
RUN apt-get install -y libqt5help5;
58-
23+
RUN apt update;
24+
RUN apt -y upgrade;
25+
RUN apt -y install build-essential;
26+
RUN apt -y install git;
27+
RUN apt -y install cmake;
28+
RUN apt -y install apt-transport-https ca-certificates gnupg software-properties-common wget ;
29+
RUN apt -y install ninja-build;
30+
RUN apt -y install ninja-build;
31+
RUN apt -y install xvfb;
32+
RUN apt -y install libopenmpi-dev;
33+
RUN apt -y install autotools-dev;
34+
RUN apt -y install libtool;
35+
RUN apt -y install automake;
36+
RUN apt -y install openmpi-bin;
37+
RUN apt -y install gettext;
38+
RUN apt -y install pkg-config;
39+
RUN apt -y install libffi-dev;
40+
RUN apt -y install libicu-dev;
41+
RUN apt -y install libxml2-dev;
42+
RUN apt -y install liblapack-dev;
43+
RUN apt -y install liblapacke-dev;
44+
RUN apt -y install fftw3;
45+
RUN apt -y install fftw3-dev;
46+
RUN apt -y install libasound-dev;
47+
RUN apt -y install portaudio19-dev;
48+
RUN apt -y install libsndfile1-dev;
49+
RUN apt -y install libtag1-dev;
50+
RUN apt -y install alsa-utils;
51+
RUN apt -y install libslicot-dev;
52+
RUN apt -y install libsqlite3-dev;
53+
RUN apt -y install libgl-dev;
54+
RUN apt -y install hdf5-tools;
55+
RUN apt -y install zlib1g-dev;
56+
RUN apt -y install libcurl4-openssl-dev;
57+
RUN apt -y install libgit2-dev;
58+
RUN apt -y install libboost-all-dev;
59+
RUN apt -y install libeigen3-dev;
60+
RUN apt -y install libhdf5-dev;
61+
RUN apt -y install libmatio-dev;
62+
RUN apt -y install qt6-base-dev;
63+
RUN apt -y install libqt6svg6-dev;
64+
RUN apt -y install qt6-declarative-dev;
65+
RUN apt -y install qt6-documentation-tools;
66+
RUN apt -y install qml6-module-qtquick;
67+
RUN apt -y install qml6-module-qtquick-templates;
68+
RUN apt -y install qml6-module-qtquick-controls;
69+
RUN apt -y install qml6-module-qtquick-window;
70+
RUN apt -y install qml6-module-qtquick-dialogs;
71+
RUN apt -y install qml6-module-qtqml-workerscript;
72+
RUN apt -y install qml6-module-qtquick-layouts;
73+
RUN apt -y install assistant-qt6;
74+
RUN apt -y install qt6-tools-dev;
5975

6076
RUN rm -rf /var/lib/apt/lists/*
6177

62-
RUN git clone https://github.com/Nelson-numerical-software/nelson.git
78+
RUN git clone https://github.com/Nelson-numerical-software/nelson.git /nelson
6379
WORKDIR "/nelson"
64-
RUN cd "/nelson" && git checkout v0.6.4
80+
RUN git checkout -b v0.6.5
6581

6682
RUN mkdir /home/nelsonuser
6783

6884
RUN groupadd -g 999 nelsonuser && \
6985
useradd -r -u 999 -g nelsonuser nelsonuser
7086

7187
RUN chown -R nelsonuser:nelsonuser /home/nelsonuser
72-
7388
RUN chown -R nelsonuser:nelsonuser /nelson
7489

7590
USER nelsonuser
7691

7792
ENV AUDIODEV null
7893

79-
RUN cmake -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" .
94+
RUN cmake -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" . -DQTDIR="/usr/lib/qt6"
8095
RUN cmake --build . -- -j $(nproc)
81-
RUN cmake --build . -- get_module_skeleton
96+
RUN cmake --build . -- -j $(nproc) get_module_skeleton
8297

83-
RUN cmake --build . -- buildhelp
84-
RUN cmake --build . -- tests_minimal
98+
RUN cmake --build . -- -j $(nproc) buildhelp
99+
RUN cmake --build . -- -j $(nproc) tests_minimal
85100

86-
RUN xvfb-run -a /nelson/bin/linux/nelson -adv-cli -e "doc;exit"
101+
RUN xvfb-run -a /nelson/bin/linux/nelson-adv-cli -e "doc;exit"
87102

88103
ENTRYPOINT ["/nelson/bin/linux/nelson-sio-cli"]

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ docker run -ti nelson-sio-cli
2828
docker rmi $(docker images -q) -f
2929
docker system prune -a
3030

31-
docker build -t nelsonsoftware/nelson-sio-cli:latest -t nelsonsoftware/nelson-sio-cli:v0.6.2 .
32-
docker push nelsonsoftware/nelson-sio-cli:v0.6.2
31+
docker build -t nelsonsoftware/nelson-sio-cli:latest -t nelsonsoftware/nelson-sio-cli:v0.6.5 .
32+
docker push nelsonsoftware/nelson-sio-cli:v0.6.5
3333
docker push nelsonsoftware/nelson-sio-cli:latest
3434

3535
```

0 commit comments

Comments
 (0)