Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 18:06:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update CI Docker containers.

Browse source
This commit is contained in:
Julian Groß 2024-12-27 11:51:49 +01:00
parent 5a6da87303
commit a03733cee5
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/pr_build.yml vendored
View file

@ -64,8 +64,8 @@ jobs:
runner: [self_hosted, type-cx52, image-x86-app-docker-ce] runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
arch: amd64 arch: amd64
build_type: full build_type: full
apt-dependencies: pkg-config libxext-dev libdouble-conversion-dev libpcre2-16-0 libpulse0 libharfbuzz-dev libnss3 libnspr4 libxdamage1 libasound2 # add missing dependencies to docker image when convenient # apt-dependencies: # add missing dependencies to docker image when convenient
image: docker.io/overte/overte-full-build:0.1.1-ubuntu-20.04-amd64 image: docker.io/overte/overte-full-build:0.1.2-ubuntu-20.04-amd64
# Android builds are currently failing # Android builds are currently failing
#- os: ubuntu-18.04 #- os: ubuntu-18.04
# build_type: android # build_type: android
@ -75,7 +75,7 @@ jobs:
runner: [self_hosted, type-cax41, image-arm-app-docker-ce] runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
arch: aarch64 arch: aarch64
build_type: full build_type: full
image: docker.io/overte/overte-full-build:0.1.1-ubuntu-22.04-aarch64 image: docker.io/overte/overte-full-build:0.1.2-ubuntu-22.04-aarch64
fail-fast: false fail-fast: false
runs-on: ${{matrix.runner}} runs-on: ${{matrix.runner}}
container: ${{matrix.image}} container: ${{matrix.image}}

6
tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-20.04
View file

@ -1,8 +1,8 @@
# Copyright 2022-2023 Overte e.V. # Copyright 2022-2024 Overte e.V.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# Docker file for building Overte # Docker file for building Overte
# Example build: docker build -t overte/overte-full-build:0.1.1-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 . # Example build: docker build -t overte/overte-full-build:0.1.2-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 .
FROM ubuntu:20.04 FROM ubuntu:20.04
LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL maintainer="Julian Groß (julian.gro@overte.org)"
LABEL description="Development image for full Overte builds" LABEL description="Development image for full Overte builds"
@ -18,6 +18,8 @@ RUN apt-get update && apt-get -y install tzdata
RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev
# Install server-console build dependencies # Install server-console build dependencies
RUN apt-get -y install npm RUN apt-get -y install npm
# Install Interface dependencies
RUN apt-get -y install pkg-config libxext-dev libdouble-conversion-dev libpcre2-16-0 libpulse0 libharfbuzz-dev libnss3 libnspr4 libxdamage1 libasound2 vulkan-validationlayers libvulkan-dev libvulkan1
# Install tools for package creation # Install tools for package creation
RUN apt-get -y install sudo chrpath binutils dh-make RUN apt-get -y install sudo chrpath binutils dh-make

6
tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-22.04
View file

@ -1,8 +1,8 @@
# Copyright 2022-2023 Overte e.V. # Copyright 2022-2024 Overte e.V.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# Docker file for building Overte # Docker file for building Overte
# Example build: docker build -t overte/overte-full-build:0.1.1-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 . # Example build: docker build -t overte/overte-full-build:0.1.2-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 .
FROM ubuntu:22.04 FROM ubuntu:22.04
LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL maintainer="Julian Groß (julian.gro@overte.org)"
LABEL description="Development image for full Overte builds" LABEL description="Development image for full Overte builds"
@ -19,7 +19,7 @@ RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websocket
# Install Overte tools build dependencies # Install Overte tools build dependencies
RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev
# Install Overte Interface build dependencies # Install Overte Interface build dependencies
RUN apt-get -y install libqt5svg5-dev qttools5-dev RUN apt-get -y install libqt5svg5-dev qttools5-dev vulkan-validationlayers libvulkan-dev libvulkan1 libqt5x11extras5-dev qtbase5-private-dev
# Install server-console build dependencies # Install server-console build dependencies
RUN apt-get -y install npm RUN apt-get -y install npm