VNC-127 Set GCC 14 explicitly and adjust build script order

This commit is contained in:
El 2025-05-09 19:19:50 +05:00
parent 0bc0875a95
commit ca6884109a
No known key found for this signature in database
GPG Key ID: EB3F4C9EA29CDE59

View File

@ -50,10 +50,6 @@ RUN zypper install -ny \
zlib-devel \ zlib-devel \
tbb-devel tbb-devel
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 140 \
--slave /usr/bin/g++ g++ /usr/bin/g++-14 \
--slave /usr/bin/gcov gcov /usr/bin/gcov-14
RUN useradd -u 1000 docker && \ RUN useradd -u 1000 docker && \
groupadd -g 1000 docker && \ groupadd -g 1000 docker && \
usermod -a -G docker docker usermod -a -G docker docker
@ -72,8 +68,11 @@ RUN ARCH=$(arch) && \
rm cmake.sh rm cmake.sh
ENV SCRIPTS_DIR=/tmp/scripts ENV SCRIPTS_DIR=/tmp/scripts
ENV CC=/usr/bin/gcc-14
ENV CXX=/usr/bin/g++-14
COPY builder/scripts $SCRIPTS_DIR COPY builder/scripts $SCRIPTS_DIR
RUN $SCRIPTS_DIR/build-webp && $SCRIPTS_DIR/build-libjpeg-turbo RUN $SCRIPTS_DIR/build-libjpeg-turbo && $SCRIPTS_DIR/build-webp
COPY --chown=docker:docker . /src/ COPY --chown=docker:docker . /src/