diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml index 4ef0c2e8b2..81f50bd76e 100644 --- a/.github/workflows/linux_server_build.yml +++ b/.github/workflows/linux_server_build.yml @@ -113,7 +113,7 @@ jobs: #~ runner: ubuntu-24.04-arm - os: rockylinux-9 - image: docker.io/overte/overte-server-build:0.1.6-rockylinux-9-amd64 + image: docker.io/overte/overte-server-build:0.1.7-rockylinux-9-amd64 arch: amd64 qt_source: source runner: ubuntu-latest diff --git a/tools/ci-scripts/rpm_package/Dockerfile_build_rockylinux-9 b/tools/ci-scripts/rpm_package/Dockerfile_build_rockylinux-9 index 0650abfbb1..8c1ee858a5 100644 --- a/tools/ci-scripts/rpm_package/Dockerfile_build_rockylinux-9 +++ b/tools/ci-scripts/rpm_package/Dockerfile_build_rockylinux-9 @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Docker file for building Overte Server -# Example build: docker build -t overte/overte-server-build:0.1.6-rockylinux-9 -f Dockerfile_build_rockylinux-9 . +# Example build: docker build --no-cache -t overte/overte-server-build:0.1.7-rockylinux-9-amd64 -f Dockerfile_build_rockylinux-9 . FROM rockylinux:9 LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL description="Development image for Overte Domain server and assignment clients." @@ -26,8 +26,16 @@ RUN dnf -y install zip unzip RUN dnf -y install chrpath rpmdevtools # Install tools needed for our Github Actions Workflow -Run dnf -y install python3-boto3 python3-github +RUN dnf -y install python3-boto3 python3-github # Install Conan RUN dnf -y install python3-pip RUN pip3 install conan + +# Install Python 2 which is required for building Qt Webengine 5.15.x +RUN curl -L -O https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz +RUN tar xf Python-2.7.18.tar.xz +RUN rm Python-2.7.18.tar.xz +RUN cd Python-2.7.18 && ./configure --prefix=/usr/local --enable-shared --enable-unicode=ucs4 && make -j8 && make altinstall +ENV LD_LIBRARY_PATH="/usr/local/lib:/usr/local/bin/python2.7:$LD_LIBRARY_PATH" +ENV PATH="$PATH:/usr/local/bin/python2.7"