fresh: Update to Qt 5.15.2

This also installs everything in one command so as to make pulling the
image download less data.

Primarily this was started to refresh the container, since the root
certificates for connecting to the internet (for things such as Conan)
have expired.
This commit is contained in:
lat9nq 2021-09-30 19:40:04 -04:00
parent 402baf3e42
commit bd491190e7

View File

@ -5,8 +5,8 @@ ENV CLANG_VER=12
ENV CMAKE_VER=3.16.3 ENV CMAKE_VER=3.16.3
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV GCC_VER=10 ENV GCC_VER=10
ENV QT_PKG_VER=512 ENV QT_PKG_VER=515
ENV QT_VER=5.12.6 ENV QT_VER=5.15.2
ENV UBUNTU_VER=bionic ENV UBUNTU_VER=bionic
# Create a user account yuzu (UID 1027) that the container will run as # Create a user account yuzu (UID 1027) that the container will run as
@ -36,9 +36,9 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
wget \ wget \
zlib1g-dev \ zlib1g-dev \
zsync && \ zsync && \
pip3 install conan pip3 install conan && \
# Install updated versions of FFmpeg, GCC, Qt, and SDL2 from launchpad repositories # Install updated versions of FFmpeg, GCC, Qt, and SDL2 from launchpad repositories
RUN add-apt-repository -y ppa:beineri/opt-qt-${QT_VER}-${UBUNTU_VER} && \ add-apt-repository -y ppa:beineri/opt-qt-${QT_VER}-${UBUNTU_VER} && \
add-apt-repository -y ppa:cybermax-dexter/sdl2-backport && \ add-apt-repository -y ppa:cybermax-dexter/sdl2-backport && \
add-apt-repository -y ppa:jonathonf/ffmpeg-4 && \ add-apt-repository -y ppa:jonathonf/ffmpeg-4 && \
add-apt-repository -y ppa:ubuntu-toolchain-r/test && \ add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
@ -55,17 +55,17 @@ RUN add-apt-repository -y ppa:beineri/opt-qt-${QT_VER}-${UBUNTU_VER} && \
qt${QT_PKG_VER}wayland \ qt${QT_PKG_VER}wayland \
qt${QT_PKG_VER}webengine && \ qt${QT_PKG_VER}webengine && \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VER} ${GCC_VER} && \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VER} ${GCC_VER} && \
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_VER} ${GCC_VER} update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_VER} ${GCC_VER} && \
# Install clang from apt.llvm.org # Install clang from apt.llvm.org
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
echo "deb http://apt.llvm.org/${UBUNTU_VER}/ llvm-toolchain-${UBUNTU_VER}-${CLANG_VER} main" >> /etc/apt/sources.list && \ echo "deb http://apt.llvm.org/${UBUNTU_VER}/ llvm-toolchain-${UBUNTU_VER}-${CLANG_VER} main" >> /etc/apt/sources.list && \
apt-get update -y && \ apt-get update -y && \
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
clang-${CLANG_VER} && \ clang-${CLANG_VER} && \
ln -s $(which clang-${CLANG_VER}) /usr/bin/clang && \ ln -s $(which clang-${CLANG_VER}) /usr/bin/clang && \
ln -s $(which clang++-${CLANG_VER}) /usr/bin/clang++ && \ ln -s $(which clang++-${CLANG_VER}) /usr/bin/clang++ && \
dpkg-reconfigure ccache dpkg-reconfigure ccache && \
RUN apt-get clean autoclean && \ apt-get clean autoclean && \
apt-get autoremove --yes && \ apt-get autoremove --yes && \
rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
# Install glslangValidator from upstream # Install glslangValidator from upstream