python-LimeReport/devcontainer
1
0
Fork 0
mirror of https://github.com/python-LimeReport/devcontainer.git synced 2024-12-24 15:04:39 +03:00
Code

update

Browse Source
This commit is contained in:
Maxim Slipenko 2023-07-18 10:49:19 +03:00
parent d6e10cd644
commit fd1a05473a
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -25,9 +25,8 @@ RUN . /extra.sh && \
ghcr.io/devcontainers-contrib/features/pipx-package:1 \ ghcr.io/devcontainers-contrib/features/pipx-package:1 \
--option package="aqtinstall" \ --option package="aqtinstall" \
--option version="${AQTINSTALL}" && \ --option version="${AQTINSTALL}" && \
rm /nanolayer rm /nanolayer && \
switch_gcc_version
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
RUN /bin/bash -c 'source /etc/profile && \ RUN /bin/bash -c 'source /etc/profile && \
aqt install --outputdir /opt/qt ${QT} ${QT_HOST} ${QT_TARGET} ${QT_ARCH} -m ${QT_MODULES}' aqt install --outputdir /opt/qt ${QT} ${QT_HOST} ${QT_TARGET} ${QT_ARCH} -m ${QT_MODULES}'

26
extra.sh
View File

@ -1,12 +1,34 @@
packages_to_install() { packages_to_install() {
echo -n "g++-9,libclang-dev,libgl1-mesa-dev,libxkbcommon-x11-0,libdbus-1-3,libpulse-mainloop-glib0" echo -n "libclang-dev,libgl1-mesa-dev,libxkbcommon-x11-0,libdbus-1-3"
case $QT in case $QT in
5*) 5*)
echo -n ",libpulse-mainloop-glib0" echo -n ",libpulse-mainloop-glib0"
;; ;;
*) *)
echo "" echo -n ""
;; ;;
esac esac
echo -n ",gcc-$(get_g_version),g++$(get_g_version)"
}
verlte() {
printf '%s\n' "$1" "$2" | sort -C -V
}
verlt() {
! verlte "$2" "$1"
}
get_g_version() {
if verlt $QT "6.5.0"; then
echo -n "9"
else
echo -n "10"
fi
}
switch_gcc_version() {
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-$(get_g_version) 60 --slave /usr/bin/g++ g++ /usr/bin/g++-$(get_g_version)
} }