Skip to content

Commit 0c0fa7e

Browse files
update image to debian bullseye
1 parent b7f6371 commit 0c0fa7e

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

Dockerfile

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
#==============================================================================
2-
# Copyright (c) 2016-2019 Allan CORNET (Nelson)
2+
# Copyright (c) 2016-present Allan CORNET (Nelson)
33
#==============================================================================
4+
# This file is part of the Nelson.
5+
#=============================================================================
46
# LICENCE_BLOCK_BEGIN
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/>.
7+
# SPDX-License-Identifier: LGPL-3.0-or-later
178
# LICENCE_BLOCK_END
189
#==============================================================================
1910

20-
FROM debian:buster-slim
11+
FROM debian:bullseye-slim
2112
LABEL maintainer="Allan CORNET [email protected]"
2213

2314
RUN apt-get update
@@ -52,30 +43,38 @@ RUN apt-get install -y libslicot0;
5243
RUN apt-get install -y zlib1g-dev;
5344
RUN apt-get install -y libcurl4-openssl-dev;
5445
RUN apt-get install -y libgit2-dev;
46+
RUN apt-get install -y libeigen3-dev;
5547
RUN apt-get install -y qtbase5-dev;
5648
RUN apt-get install -y qtdeclarative5-dev;
5749
RUN apt-get install -y libqt5webkit5-dev;
58-
RUN apt-get install -y qttools5-dev-tools;
59-
RUN apt-get install -y qml-module-qtquick-controls;
60-
RUN apt-get install -y qml-module-qtquick-dialogs;
61-
RUN apt-get install -y libqt5opengl5-dev;
6250
RUN apt-get install -y qtbase5-private-dev;
6351
RUN apt-get install -y qtdeclarative5-dev;
64-
RUN apt-get install -y libqt5help5;
52+
RUN apt-get install -y qml-module-qtquick-controls;
53+
RUN apt-get install -y qml-module-qtquick-dialogs;
6554
RUN apt-get install -y qttools5-dev;
6655
RUN apt-get install -y qttools5-dev-tools;
56+
RUN apt-get install -y libqt5opengl5-dev;
57+
RUN apt-get install -y libqt5help5;
6758

68-
RUN rm -rf /var/lib/apt/lists/*
6959

70-
RUN git clone https://gitlab.com/libeigen/eigen.git /tmp/eigen
71-
RUN mkdir /tmp/eigen-build && cd /tmp/eigen && git checkout 3.4 && cd - && cd /tmp/eigen-build && cmake . /tmp/eigen && make -j4 && make install;
60+
RUN rm -rf /var/lib/apt/lists/*
7261

73-
RUN git clone https://github.com/Nelson-numerical-software/nelson.git /nelson
62+
RUN git clone https://github.com/Nelson-numerical-software/nelson.git
7463
WORKDIR "/nelson"
75-
RUN git checkout -b v0.6.4
64+
RUN cd "/nelson" && git checkout v0.6.4
65+
66+
RUN mkdir /home/nelsonuser
67+
68+
RUN groupadd -g 999 nelsonuser && \
69+
useradd -r -u 999 -g nelsonuser nelsonuser
70+
71+
RUN chown -R nelsonuser:nelsonuser /home/nelsonuser
72+
73+
RUN chown -R nelsonuser:nelsonuser /nelson
74+
75+
USER nelsonuser
7676

7777
ENV AUDIODEV null
78-
ENV PATH="/usr/lib/x86_64-linux-gnu/qt5/bin/:${PATH}"
7978

8079
RUN cmake -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" .
8180
RUN cmake --build . -- -j $(nproc)

0 commit comments

Comments
 (0)