mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-06 01:03:19 +02:00
Merge pull request #1333 from JulianGro/fedora41
Update GitHub Actions server packaging
This commit is contained in:
GitHub
commit
c137c0c5eb
24 changed files with 377 additions and 140 deletions
60
.github/workflows/linux_server_build.yml
vendored
60
.github/workflows/linux_server_build.yml
vendored
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright 2013-2019 High Fidelity, Inc.
|
||||
# Copyright 2020-2022 Vircadia contributors.
|
||||
# Copyright 2021-2024 Overte e.V.
|
||||
# Copyright 2021-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
name: Linux Server CI Build
|
||||
|
|
@ -33,7 +33,7 @@ jobs:
|
|||
matrix:
|
||||
include:
|
||||
- os: debian-11
|
||||
image: docker.io/overte/overte-server-build:0.1.3-debian-11-amd64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-debian-11-amd64
|
||||
arch: amd64
|
||||
# https://github.com/testflows/TestFlows-GitHub-Hetzner-Runners/wiki/Meta-Labels
|
||||
# self_hosted makes the Hetzner auto-scaler put up the job.
|
||||
|
|
@ -43,57 +43,87 @@ jobs:
|
|||
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
|
||||
|
||||
- os: debian-11
|
||||
image: docker.io/overte/overte-server-build:0.1.3-debian-11-aarch64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-debian-11-aarch64
|
||||
arch: aarch64
|
||||
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
|
||||
|
||||
- os: debian-12
|
||||
image: docker.io/overte/overte-server-build:0.1.3-debian-12-amd64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-debian-12-amd64
|
||||
arch: amd64
|
||||
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
|
||||
|
||||
- os: debian-12
|
||||
image: docker.io/overte/overte-server-build:0.1.3-debian-12-aarch64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-debian-12-aarch64
|
||||
arch: aarch64
|
||||
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
|
||||
|
||||
- os: debian-13
|
||||
image: docker.io/overte/overte-server-build:0.1.6-debian-13-amd64
|
||||
arch: amd64
|
||||
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
|
||||
|
||||
- os: debian-13
|
||||
image: docker.io/overte/overte-server-build:0.1.6-debian-13-aarch64
|
||||
arch: aarch64
|
||||
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
|
||||
|
||||
- os: ubuntu-20.04
|
||||
image: docker.io/overte/overte-server-build:0.1.3-ubuntu-20.04-amd64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-ubuntu-20.04-amd64
|
||||
arch: amd64
|
||||
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
|
||||
|
||||
- os: ubuntu-22.04
|
||||
image: docker.io/overte/overte-server-build:0.1.3-ubuntu-22.04-amd64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-ubuntu-22.04-amd64
|
||||
arch: amd64
|
||||
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
|
||||
|
||||
- os: ubuntu-22.04
|
||||
image: docker.io/overte/overte-server-build:0.1.3-ubuntu-22.04-aarch64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-ubuntu-22.04-aarch64
|
||||
arch: aarch64
|
||||
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
|
||||
|
||||
- os: ubuntu-24.04
|
||||
image: docker.io/overte/overte-server-build:0.1.3-ubuntu-24.04-amd64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-ubuntu-24.04-amd64
|
||||
arch: amd64
|
||||
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
|
||||
|
||||
- os: ubuntu-24.04
|
||||
image: docker.io/overte/overte-server-build:0.1.3-ubuntu-24.04-aarch64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-ubuntu-24.04-aarch64
|
||||
arch: aarch64
|
||||
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
|
||||
|
||||
- os: fedora-40
|
||||
image: docker.io/overte/overte-server-build:0.1.4-fedora-40-amd64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-fedora-40-amd64
|
||||
arch: amd64
|
||||
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
|
||||
|
||||
- os: fedora-40
|
||||
image: docker.io/overte/overte-server-build:0.1.4-fedora-40-aarch64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-fedora-40-aarch64
|
||||
arch: aarch64
|
||||
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
|
||||
|
||||
- os: fedora-41
|
||||
image: docker.io/overte/overte-server-build:0.1.6-fedora-41-amd64
|
||||
arch: amd64
|
||||
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
|
||||
|
||||
- os: fedora-41
|
||||
image: docker.io/overte/overte-server-build:0.1.6-fedora-41-aarch64
|
||||
arch: aarch64
|
||||
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
|
||||
|
||||
#~ - os: fedora-42
|
||||
#~ image: docker.io/overte/overte-server-build:0.1.6-fedora-42-amd64
|
||||
#~ arch: amd64
|
||||
#~ runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
|
||||
|
||||
#~ - os: fedora-42
|
||||
#~ image: docker.io/overte/overte-server-build:0.1.6-fedora-42-aarch64
|
||||
#~ arch: aarch64
|
||||
#~ runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
|
||||
|
||||
- os: rockylinux-9
|
||||
image: docker.io/overte/overte-server-build:0.1.3-rockylinux-9-amd64
|
||||
image: docker.io/overte/overte-server-build:0.1.6-rockylinux-9-amd64
|
||||
arch: amd64
|
||||
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
|
||||
|
||||
|
|
@ -216,6 +246,10 @@ jobs:
|
|||
echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.el9.$INSTALLER_EXT" >> $GITHUB_ENV
|
||||
elif [ "${{ matrix.os }}" == "fedora-40" ]; then
|
||||
echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc40.$INSTALLER_EXT" >> $GITHUB_ENV
|
||||
elif [ "${{ matrix.os }}" == "fedora-41" ]; then
|
||||
echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc41.$INSTALLER_EXT" >> $GITHUB_ENV
|
||||
elif [ "${{ matrix.os }}" == "fedora-42" ]; then
|
||||
echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc42.$INSTALLER_EXT" >> $GITHUB_ENV
|
||||
else
|
||||
echo "Error! ARTIFACT_PATTERN not set!"
|
||||
exit 1 # Fail
|
||||
|
|
|
|||
10
.github/workflows/pr_build.yml
vendored
10
.github/workflows/pr_build.yml
vendored
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright 2013-2019 High Fidelity, Inc.
|
||||
# Copyright 2020-2022 Vircadia contributors.
|
||||
# Copyright 2021-2024 Overte e.V.
|
||||
# Copyright 2021-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
name: Pull Request CI Build
|
||||
|
|
@ -64,8 +64,8 @@ jobs:
|
|||
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
|
||||
arch: amd64
|
||||
build_type: full
|
||||
apt-dependencies: python3-packaging # add missing dependencies to docker image when convenient
|
||||
image: docker.io/overte/overte-full-build:0.1.2-ubuntu-20.04-amd64
|
||||
# apt-dependencies: # add missing dependencies to docker image when convenient
|
||||
image: docker.io/overte/overte-full-build:0.1.6-ubuntu-20.04-amd64
|
||||
# Android builds are currently failing
|
||||
#- os: ubuntu-18.04
|
||||
# build_type: android
|
||||
|
|
@ -75,8 +75,8 @@ jobs:
|
|||
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
|
||||
arch: aarch64
|
||||
build_type: full
|
||||
image: docker.io/overte/overte-full-build:0.1.2-ubuntu-22.04-aarch64
|
||||
apt-dependencies: python3-packaging
|
||||
image: docker.io/overte/overte-full-build:0.1.6-ubuntu-22.04-aarch64
|
||||
# apt-dependencies: # add missing dependencies to docker image when convenient
|
||||
fail-fast: false
|
||||
runs-on: ${{matrix.runner}}
|
||||
container: ${{matrix.image}}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,8 @@
|
|||
# Copyright 2013-2019 High Fidelity, Inc.
|
||||
# Copyright 2019-2021 Vircadia contributors.
|
||||
# Copyright 2020-2023 Overte e.V.
|
||||
# Copyright 2020-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# If we're running under the gradle build, HIFI_ANDROID will be set here, but
|
||||
# ANDROID will not be set until after the `project` statement. This is the *ONLY*
|
||||
# place you need to use `HIFI_ANDROID` instead of `ANDROID`
|
||||
if (WIN32 AND NOT HIFI_ANDROID)
|
||||
cmake_minimum_required(VERSION 3.7)
|
||||
else()
|
||||
cmake_minimum_required(VERSION 3.2)
|
||||
endif()
|
||||
|
||||
# 3.14 is the minimum version that supports symlinks on Windows
|
||||
cmake_minimum_required(VERSION 3.14)
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,60 @@
|
|||
From 1e4955adbcd9b3f5eaf2129e918ca057baed6520 Mon Sep 17 00:00:00 2001
|
||||
From: Arcady Goldmints-Orlov <arcady@lunarg.com>
|
||||
Date: Mon, 20 Feb 2023 20:02:36 -0500
|
||||
Subject: [PATCH] Include <cstdint> header in Common.h
|
||||
|
||||
This change also cleans up some ifdef'd code for no longer supported
|
||||
versions of MSVC.
|
||||
|
||||
Fixes: #3139
|
||||
---
|
||||
glslang/Include/Common.h | 19 ++-----------------
|
||||
1 file changed, 2 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/glslang/Include/Common.h b/glslang/Include/Common.h
|
||||
index c7f52563..080b8071 100644
|
||||
--- a/glslang/Include/Common.h
|
||||
+++ b/glslang/Include/Common.h
|
||||
@@ -44,6 +44,7 @@
|
||||
#else
|
||||
#include <cmath>
|
||||
#endif
|
||||
+#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <list>
|
||||
@@ -66,7 +67,7 @@ std::string to_string(const T& val) {
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) || (defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API)
|
||||
+#if defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API
|
||||
#include <basetsd.h>
|
||||
#ifndef snprintf
|
||||
#define snprintf sprintf_s
|
||||
@@ -82,22 +83,6 @@ std::string to_string(const T& val) {
|
||||
#define UINT_PTR uintptr_t
|
||||
#endif
|
||||
|
||||
-#if defined(_MSC_VER) && _MSC_VER < 1800
|
||||
- #include <stdlib.h>
|
||||
- inline long long int strtoll (const char* str, char** endptr, int base)
|
||||
- {
|
||||
- return _strtoi64(str, endptr, base);
|
||||
- }
|
||||
- inline unsigned long long int strtoull (const char* str, char** endptr, int base)
|
||||
- {
|
||||
- return _strtoui64(str, endptr, base);
|
||||
- }
|
||||
- inline long long int atoll (const char* str)
|
||||
- {
|
||||
- return strtoll(str, NULL, 10);
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
#if defined(_MSC_VER)
|
||||
#define strdup _strdup
|
||||
#endif
|
||||
--
|
||||
2.47.2
|
||||
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Fri, 2 Aug 2024 22:44:21 +0100
|
||||
Subject: [PATCH] SPIRV/SpvBuilder.h: add missing <cstdint> include
|
||||
|
||||
Without the change `glslang` build fails on upcoming `gcc-15` as:
|
||||
|
||||
In file included from /build/source/SPIRV/GlslangToSpv.cpp:45:
|
||||
SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared
|
||||
248 | Id makeDebugLexicalBlock(uint32_t line);
|
||||
| ^~~~~~~~
|
||||
---
|
||||
SPIRV/SpvBuilder.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h
|
||||
index f86dd81b..d688436a 100644
|
||||
--- a/SPIRV/SpvBuilder.h
|
||||
+++ b/SPIRV/SpvBuilder.h
|
||||
@@ -56,6 +56,7 @@ namespace spv {
|
||||
}
|
||||
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <set>
|
||||
--
|
||||
2.47.2
|
||||
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
Source: glslang
|
||||
Version: untagged-048c4dbc7f021224a933-1
|
||||
Version: 11.13.0
|
||||
Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
|
||||
|
|
|
|||
|
|
@ -3,9 +3,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO KhronosGroup/glslang
|
||||
REF untagged-048c4dbc7f021224a933
|
||||
SHA512 e3097dd2db88320982d7da1ddce138839daf3251935909c3998a114aeadd408760b26b2d7c7ee547fb0519895ac1853a45c23df2eecf61135849b080252e9dec
|
||||
REF 11.13.0
|
||||
SHA512 20c2a6543b002648f459f26bd36b5c445afd6d8eae175e400dbe45632f11ca8de1f9e6f6e98fd6f910aa75d90063e174c095e7df26d9d4982192b84d08b0dc8b
|
||||
HEAD_REF master
|
||||
PATCHES 0001-Include-cstdint-header-in-Common.h.patch 0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright 2023 Overte e.V.
|
||||
# Copyright 2023-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: MIT
|
||||
Source: node
|
||||
Version: 18.14.2-1
|
||||
Version: 18.20.7
|
||||
Homepage: https://nodejs.org/
|
||||
Description: Node.js JavaScript runtime.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright 2023-2024 Overte e.V.
|
||||
# Copyright 2023-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
set(NODE_VERSION 18.14.2)
|
||||
|
|
@ -28,10 +28,9 @@ else ()
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO nodejs/node
|
||||
REF v18.20.2
|
||||
SHA512 10d3637c26274677d137f76bbb648d0e7851c994634a16c89858c3a13094a0692ea2cb9a787c6463c3001abd71dab0d83123127bc305171d097c48d21d691678
|
||||
HEAD_REF v18.20.2
|
||||
PATCHES replace-distutils.patch replace-distutils2.patch
|
||||
REF v18.20.7
|
||||
SHA512 0d7000937b9b5089affc23daa7222938213bd5d77b8ed872d8cb424570fbc3e1567362c18ee8ef99413be098f7ff9fb82d49b9fc92fc93589628b07d1464b3ff
|
||||
HEAD_REF v18.20.7
|
||||
)
|
||||
# node cannot configure out of source, which VCPKG expects. So we copy the source to the configure directory.
|
||||
file(COPY ${SOURCE_PATH}/ DESTINATION "${CURRENT_BUILDTREES_DIR}")
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
commit 95534ad82f4e33f53fd50efe633d43f8da70cba6
|
||||
Author: Luigi Pinca <luigipinca@gmail.com>
|
||||
Date: Wed Nov 8 21:20:53 2023 +0100
|
||||
|
||||
build: fix build with Python 3.12
|
||||
|
||||
Replace `distutils.version.StrictVersion` with
|
||||
`packaging.version.Version`.
|
||||
|
||||
Refs: https://github.com/nodejs/node/pull/50209#issuecomment-1795852539
|
||||
PR-URL: https://github.com/nodejs/node/pull/50582
|
||||
Reviewed-By: Richard Lau <rlau@redhat.com>
|
||||
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
|
||||
|
||||
diff --git a/configure.py b/configure.py
|
||||
index 33671a0342..be95decd56 100755
|
||||
--- a/configure.py
|
||||
+++ b/configure.py
|
||||
@@ -14,8 +14,6 @@ import bz2
|
||||
import io
|
||||
from pathlib import Path
|
||||
|
||||
-from distutils.version import StrictVersion
|
||||
-
|
||||
# If not run from node/, cd to node/.
|
||||
os.chdir(Path(__file__).parent)
|
||||
|
||||
@@ -30,6 +28,7 @@ tools_path = Path('tools')
|
||||
|
||||
sys.path.insert(0, str(tools_path / 'gyp' / 'pylib'))
|
||||
from gyp.common import GetFlavor
|
||||
+from packaging.version import Version
|
||||
|
||||
# imports in tools/configure.d
|
||||
sys.path.insert(0, str(tools_path / 'configure.d'))
|
||||
@@ -1566,10 +1565,10 @@ def configure_openssl(o):
|
||||
# supported asm compiler for AVX2. See https://github.com/openssl/openssl/
|
||||
# blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
|
||||
openssl110_asm_supported = \
|
||||
- ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \
|
||||
- ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \
|
||||
- ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \
|
||||
- ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10'))
|
||||
+ ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \
|
||||
+ ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \
|
||||
+ ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \
|
||||
+ ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10'))
|
||||
|
||||
if is_x86 and not openssl110_asm_supported:
|
||||
error('''Did not find a new enough assembler, install one or build with
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
diff -ru node/tools/gyp/pylib/gyp/input.py node.patched/tools/gyp/pylib/gyp/input.py
|
||||
--- node/tools/gyp/pylib/gyp/input.py 2024-04-10 14:12:07.000000000 +0200
|
||||
+++ node.patched/tools/gyp/pylib/gyp/input.py 2025-02-27 21:58:01.579193906 +0100
|
||||
@@ -16,7 +16,7 @@
|
||||
import sys
|
||||
import threading
|
||||
import traceback
|
||||
-from distutils.version import StrictVersion
|
||||
+from packaging.version import Version
|
||||
from gyp.common import GypError
|
||||
from gyp.common import OrderedSet
|
||||
|
||||
@@ -1190,7 +1190,7 @@
|
||||
else:
|
||||
ast_code = compile(cond_expr_expanded, "<string>", "eval")
|
||||
cached_conditions_asts[cond_expr_expanded] = ast_code
|
||||
- env = {"__builtins__": {}, "v": StrictVersion}
|
||||
+ env = {"__builtins__": {}, "v": Version}
|
||||
if eval(ast_code, env, variables):
|
||||
return true_dict
|
||||
return false_dict
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# Copyright 2022-2023 Overte e.V.
|
||||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte Server
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.3-debian-11 -f Dockerfile_build_debian-11 .
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.6-debian-11 -f Dockerfile_build_debian-11 .
|
||||
FROM debian:bullseye
|
||||
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
|
||||
LABEL description="Development image for Overte Domain server and assignment clients."
|
||||
|
|
@ -14,8 +14,12 @@ RUN echo UTC >/etc/timezone
|
|||
# Installing via dependency causes interactive hang:
|
||||
RUN apt-get update && apt-get -y install tzdata
|
||||
|
||||
# Install Conan
|
||||
RUN apt-get -y install python3-pip
|
||||
RUN pip3 install conan
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
RUN apt-get -y install curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev
|
||||
RUN apt-get -y install curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging
|
||||
|
||||
# Install CMake from Debian Backports
|
||||
RUN echo deb http://deb.debian.org/debian bullseye-backports main > /etc/apt/sources.list.d/bullseye-backports.list
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Copyright 2022-2023 Overte e.V.
|
||||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte Server
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.3-debian-12 -f Dockerfile_build_debian-12 .
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.6-debian-12 -f Dockerfile_build_debian-12 .
|
||||
FROM debian:bookworm
|
||||
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
|
||||
LABEL description="Development image for Overte Domain server and assignment clients."
|
||||
|
|
@ -14,8 +14,12 @@ RUN echo UTC >/etc/timezone
|
|||
# Installing via dependency causes interactive hang:
|
||||
RUN apt-get update && apt-get -y install tzdata
|
||||
|
||||
# Install Conan
|
||||
RUN apt-get -y install python3-pip
|
||||
RUN pip3 install --break-system-packages conan
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
RUN apt-get -y install cmake curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev
|
||||
RUN apt-get -y install cmake curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging
|
||||
|
||||
# Install Overte tools build dependencies
|
||||
RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev
|
||||
|
|
@ -36,4 +40,4 @@ RUN echo "export LANG=en_US.UTF-8" >> ~/.bashrc
|
|||
RUN echo "export LANGUAGE=en_US.UTF-8" >> ~/.bashrc
|
||||
|
||||
# Install tools needed for our Github Actions Workflow
|
||||
Run apt-get -y install python3-boto3 python3-github zip
|
||||
RUN apt-get -y install python3-boto3 python3-github zip
|
||||
|
|
|
|||
43
tools/ci-scripts/deb_package/Dockerfile_build_debian-13
Normal file
43
tools/ci-scripts/deb_package/Dockerfile_build_debian-13
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte Server
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.6-debian-13 -f Dockerfile_build_debian-13 .
|
||||
FROM debian:trixie
|
||||
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
|
||||
LABEL description="Development image for Overte Domain server and assignment clients."
|
||||
|
||||
# Don't use any frontend when installing packages during the creation of this container
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN echo UTC >/etc/timezone
|
||||
# Installing via dependency causes interactive hang:
|
||||
RUN apt-get update && apt-get -y install tzdata
|
||||
|
||||
# Install Conan
|
||||
RUN apt-get -y install python3-pip
|
||||
RUN pip3 install --break-system-packages conan
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
RUN apt-get -y install cmake curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging
|
||||
|
||||
# Install Overte tools build dependencies
|
||||
RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev
|
||||
|
||||
# Install tools for package creation
|
||||
RUN apt-get -y install sudo chrpath binutils dh-make
|
||||
|
||||
# Install locales package
|
||||
RUN apt-get -y install locales
|
||||
# Uncomment en_US.UTF-8 for inclusion in generation
|
||||
RUN sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen
|
||||
# Generate locale
|
||||
RUN locale-gen
|
||||
|
||||
# Export env vars
|
||||
RUN echo "export LC_ALL=en_US.UTF-8" >> ~/.bashrc
|
||||
RUN echo "export LANG=en_US.UTF-8" >> ~/.bashrc
|
||||
RUN echo "export LANGUAGE=en_US.UTF-8" >> ~/.bashrc
|
||||
|
||||
# Install tools needed for our Github Actions Workflow
|
||||
RUN apt-get -y install python3-boto3 python3-github zip
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# Copyright 2022-2023 Overte e.V.
|
||||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte Server
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.3-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 .
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.6-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 .
|
||||
FROM ubuntu:20.04
|
||||
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
|
||||
LABEL description="Development image for Overte Domain server and assignment clients."
|
||||
|
|
@ -14,8 +14,29 @@ RUN echo UTC >/etc/timezone
|
|||
# Installing via dependency causes interactive hang:
|
||||
RUN apt-get update && apt-get -y install tzdata
|
||||
|
||||
# Install Conan
|
||||
RUN apt-get -y install python3-pip
|
||||
RUN pip3 install conan
|
||||
|
||||
# Install CMake from Kitware
|
||||
RUN apt-get update
|
||||
RUN apt-get -y install ca-certificates gpg wget
|
||||
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
|
||||
RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
|
||||
RUN apt-get update
|
||||
RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring
|
||||
RUN apt-get -y install cmake
|
||||
|
||||
# Install GCC 13 from Toolchain test PPA
|
||||
RUN apt-get -y install software-properties-common
|
||||
RUN add-apt-repository ppa:ubuntu-toolchain-r/test
|
||||
RUN apt-get update
|
||||
RUN apt-get -y install gcc-13 g++-13
|
||||
# Set GCC 13 as default
|
||||
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libharfbuzz-dev libdouble-conversion3 libxext-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 libharfbuzz-dev libdouble-conversion3 libxext-dev libsystemd-dev python3-packaging
|
||||
|
||||
# Install tools for package creation
|
||||
RUN apt-get -y install sudo chrpath binutils dh-make
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Copyright 2022-2023 Overte e.V.
|
||||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte Server
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.3-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 .
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.6-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 .
|
||||
FROM ubuntu:22.04
|
||||
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
|
||||
LABEL description="Development image for Overte Domain server and assignment clients."
|
||||
|
|
@ -14,8 +14,29 @@ RUN echo UTC >/etc/timezone
|
|||
# Installing via dependency causes interactive hang:
|
||||
RUN apt-get update && apt-get -y install tzdata
|
||||
|
||||
# Install Conan
|
||||
RUN apt-get -y install python3-pip
|
||||
RUN pip3 install conan
|
||||
|
||||
# Install CMake from Kitware
|
||||
RUN apt-get update
|
||||
RUN apt-get -y install ca-certificates gpg wget
|
||||
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
|
||||
RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
|
||||
RUN apt-get update
|
||||
RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring
|
||||
RUN apt-get -y install cmake
|
||||
|
||||
# Install GCC 13 from Toolchain test PPA
|
||||
RUN apt-get -y install software-properties-common
|
||||
RUN add-apt-repository ppa:ubuntu-toolchain-r/test
|
||||
RUN apt-get update
|
||||
RUN apt-get -y install gcc-13 g++-13
|
||||
# Set GCC 13 as default
|
||||
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-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 libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging
|
||||
# Install Overte tools build dependencies
|
||||
RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Copyright 2022-2024 Overte e.V.
|
||||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte Server
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.3-ubuntu-24.04 -f Dockerfile_build_ubuntu-24.04 .
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.6-ubuntu-24.04 -f Dockerfile_build_ubuntu-24.04 .
|
||||
FROM ubuntu:24.04
|
||||
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
|
||||
LABEL description="Development image for Overte Domain server and assignment clients."
|
||||
|
|
@ -14,8 +14,12 @@ RUN echo UTC >/etc/timezone
|
|||
# Installing via dependency causes interactive hang:
|
||||
RUN apt-get update && apt-get -y install tzdata
|
||||
|
||||
# Install Conan
|
||||
RUN apt-get -y install python3-pip
|
||||
RUN pip3 install --break-system-packages conan
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-setuptools python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev
|
||||
RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-setuptools python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging
|
||||
# Install Overte tools build dependencies
|
||||
RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev
|
||||
|
||||
|
|
@ -35,4 +39,4 @@ RUN echo "export LANG=en_US.UTF-8" >> ~/.bashrc
|
|||
RUN echo "export LANGUAGE=en_US.UTF-8" >> ~/.bashrc
|
||||
|
||||
# Install tools needed for our Github Actions Workflow
|
||||
Run apt-get -y install python3-boto3 python3-github zip
|
||||
RUN apt-get -y install python3-boto3 python3-github zip
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Copyright 2022-2024 Overte e.V.
|
||||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte
|
||||
# Example build: docker build -t overte/overte-full-build:0.1.2-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 .
|
||||
# Example build: docker build -t overte/overte-full-build:0.1.6-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 .
|
||||
FROM ubuntu:20.04
|
||||
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
|
||||
LABEL description="Development image for full Overte builds"
|
||||
|
|
@ -14,12 +14,33 @@ RUN echo UTC >/etc/timezone
|
|||
# Installing via dependency causes interactive hang:
|
||||
RUN apt-get update && apt-get -y install tzdata
|
||||
|
||||
# Install Conan
|
||||
RUN apt-get -y install python3-pip
|
||||
RUN pip3 install conan
|
||||
|
||||
# Install CMake from Kitware
|
||||
RUN apt-get update
|
||||
RUN apt-get -y install ca-certificates gpg wget
|
||||
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
|
||||
RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
|
||||
RUN apt-get update
|
||||
RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring
|
||||
RUN apt-get -y install cmake
|
||||
|
||||
# Install GCC 13 from Toolchain test PPA
|
||||
RUN apt-get -y install software-properties-common
|
||||
RUN add-apt-repository ppa:ubuntu-toolchain-r/test
|
||||
RUN apt-get update
|
||||
RUN apt-get -y install gcc-13 g++-13
|
||||
# Set GCC 13 as default
|
||||
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
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
|
||||
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
|
||||
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 python3-packaging
|
||||
|
||||
# Install tools for package creation
|
||||
RUN apt-get -y install sudo chrpath binutils dh-make
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Copyright 2022-2024 Overte e.V.
|
||||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte
|
||||
# Example build: docker build -t overte/overte-full-build:0.1.2-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 .
|
||||
# Example build: docker build -t overte/overte-full-build:0.1.6-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 .
|
||||
FROM ubuntu:22.04
|
||||
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
|
||||
LABEL description="Development image for full Overte builds"
|
||||
|
|
@ -14,8 +14,29 @@ RUN echo UTC >/etc/timezone
|
|||
# Installing via dependency causes interactive hang:
|
||||
RUN apt-get update && apt-get -y install tzdata
|
||||
|
||||
# Install Conan
|
||||
RUN apt-get -y install python3-pip
|
||||
RUN pip3 install conan
|
||||
|
||||
# Install CMake from Kitware
|
||||
RUN apt-get update
|
||||
RUN apt-get -y install ca-certificates gpg wget
|
||||
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
|
||||
RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
|
||||
RUN apt-get update
|
||||
RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring
|
||||
RUN apt-get -y install cmake
|
||||
|
||||
# Install GCC 13 from Toolchain test PPA
|
||||
RUN apt-get -y install software-properties-common
|
||||
RUN add-apt-repository ppa:ubuntu-toolchain-r/test
|
||||
RUN apt-get update
|
||||
RUN apt-get -y install gcc-13 g++-13
|
||||
# Set GCC 13 as default
|
||||
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtscript5-dev qtdeclarative5-dev qtmultimedia5-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 libqt5websockets5-dev qtscript5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging
|
||||
# Install Overte tools build dependencies
|
||||
RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev
|
||||
# Install Overte Interface build dependencies
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
# Copyright 2022-2024 Overte e.V.
|
||||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte Server
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.4-fedora-40 -f Dockerfile_build_fedora-40 .
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.6-fedora-40 -f Dockerfile_build_fedora-40 .
|
||||
FROM fedora:40
|
||||
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
|
||||
LABEL description="Development image for Overte Domain server and assignment clients."
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3
|
||||
RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3 python3-packaging
|
||||
|
||||
# Install additional build tools
|
||||
RUN dnf -y install zip unzip
|
||||
|
|
@ -17,4 +17,7 @@ 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-pygithub
|
||||
RUN dnf -y install python3-boto3 python3-pygithub
|
||||
|
||||
# Install Conan
|
||||
RUN dnf -y install conan
|
||||
|
|
|
|||
23
tools/ci-scripts/rpm_package/Dockerfile_build_fedora-41
Normal file
23
tools/ci-scripts/rpm_package/Dockerfile_build_fedora-41
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte Server
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.6-fedora-41 -f Dockerfile_build_fedora-41 .
|
||||
FROM fedora:41
|
||||
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
|
||||
LABEL description="Development image for Overte Domain server and assignment clients."
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3 python3-packaging
|
||||
|
||||
# Install additional build tools
|
||||
RUN dnf -y install zip unzip
|
||||
|
||||
# Install tools for package creation
|
||||
RUN dnf -y install chrpath rpmdevtools
|
||||
|
||||
# Install tools needed for our Github Actions Workflow
|
||||
Run dnf -y install python3-boto3 python3-pygithub
|
||||
|
||||
# Install Conan
|
||||
RUN dnf -y install conan
|
||||
23
tools/ci-scripts/rpm_package/Dockerfile_build_fedora-42
Normal file
23
tools/ci-scripts/rpm_package/Dockerfile_build_fedora-42
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte Server
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.6-fedora-42 -f Dockerfile_build_fedora-42 .
|
||||
FROM fedora:42
|
||||
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
|
||||
LABEL description="Development image for Overte Domain server and assignment clients."
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3 python3-packaging
|
||||
|
||||
# Install additional build tools
|
||||
RUN dnf -y install zip unzip
|
||||
|
||||
# Install tools for package creation
|
||||
RUN dnf -y install chrpath rpmdevtools
|
||||
|
||||
# Install tools needed for our Github Actions Workflow
|
||||
Run dnf -y install python3-boto3 python3-pygithub
|
||||
|
||||
# Install Conan
|
||||
RUN dnf -y install conan
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# Copyright 2022-2023 Overte e.V.
|
||||
# Copyright 2022-2025 Overte e.V.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
# Docker file for building Overte Server
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.3-rockylinux-9 -f Dockerfile_build_rockylinux-9 .
|
||||
# Example build: docker build -t overte/overte-server-build:0.1.6-rockylinux-9 -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."
|
||||
|
|
@ -16,7 +16,8 @@ RUN dnf -y install epel-release
|
|||
RUN dnf config-manager --enable crb
|
||||
|
||||
# Install Overte domain-server and assignment-client build dependencies
|
||||
RUN dnf -y install curl ninja-build git cmake gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel
|
||||
# Work around an issue with aarch64 shipping curl-minimal and us requesting curl by allowing dnf to use erase curl-minimal.
|
||||
RUN dnf -y --allowerasing install curl ninja-build git cmake gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3-packaging
|
||||
|
||||
# Install additional build tools
|
||||
RUN dnf -y install zip unzip
|
||||
|
|
@ -26,3 +27,7 @@ RUN dnf -y install chrpath rpmdevtools
|
|||
|
||||
# Install tools needed for our Github Actions Workflow
|
||||
Run dnf -y install python3-boto3 python3-github
|
||||
|
||||
# Install Conan
|
||||
RUN dnf -y install python3-pip
|
||||
RUN pip3 install conan
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ def processCommand(line):
|
|||
executeSubprocess(scribeArgs)
|
||||
|
||||
# Generate the un-optimized output
|
||||
executeSubprocess([glslangExec, '-V110', '-o', upoptSpirvFile, unoptGlslFile])
|
||||
executeSubprocess([glslangExec, '-V100', '-o', upoptSpirvFile, unoptGlslFile])
|
||||
|
||||
# Optimize the SPIRV
|
||||
executeSubprocess([spirvOptExec, '-O', '-o', spirvFile, upoptSpirvFile])
|
||||
|
|
|
|||
Loading…
Reference in a new issue