Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Trigger #8

Merged
merged 6 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
name: Build and Push Domain Server Images
on:
push:
branches:
- main
- testing
workflow_dispatch: # Add this line to enable manual triggering
jobs:
build-and-push:
runs-on:
Expand Down Expand Up @@ -38,8 +38,6 @@ jobs:
run: >
podman tag ghcr.io/${{ github.repository }}/domain-server:latest docker.io/${{ secrets.DOCKERHUB_USERNAME }}/domain-server:latest
podman push docker.io/${{ secrets.DOCKERHUB_USERNAME }}/domain-server:latest

- name: Clean up
run: >
podman system prune

11 changes: 7 additions & 4 deletions Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Docker environment for building Overte server
# Docker environment for building Overte server (Updated 02/07/2024)
FROM ubuntu:22.04

ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -8,7 +8,7 @@ RUN mkdir /opt/overte-build \
&& mkdir /opt/overte

# Install dependencies
RUN apt update && apt install -y python3-full zip tzdata curl ninja-build git cmake g++ npm libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev \
RUN apt update && apt install -y python3-full zip tzdata curl ninja-build git cmake g++ libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev \
libqt5websockets5-dev qtscript5-dev qtdeclarative5-dev qtmultimedia5-dev libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev

# Fetch repository
Expand All @@ -24,7 +24,9 @@ RUN cd /opt/overte-build \

# put number after -j to limit cores.
RUN cd /opt/overte-build/build \
&& make -j
&& make -j domain-server \
&& make -j assignment-client \
&& make -j oven # needed for baking

RUN VCPKG_PATH=$(python3 /opt/overte-build/prebuild.py --get-vcpkg-path --build-root . --quiet) && \
echo "VCPKG Path: $VCPKG_PATH" && \
Expand All @@ -35,4 +37,5 @@ RUN mv /opt/overte-build/build/libraries /opt/overte/libraries \
&& mv /opt/overte-build/build/assignment-client/assignment-client /opt/overte/assignment-client \
&& mv /opt/overte-build/build/assignment-client/plugins /opt/overte/plugins \
&& mv /opt/overte-build/build/domain-server/domain-server /opt/overte/domain-server \
&& mv /opt/overte-build/domain-server/resources /opt/overte/resources
&& mv /opt/overte-build/domain-server/resources /opt/overte/resources \
&& mv /opt/overte-build/build/tools/oven/oven /opt/overte/oven
2 changes: 1 addition & 1 deletion Dockerfile.runtime
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Overte Server runtime image. domain-server-builder must be built first.
# Overte Server runtime image. domain-server-builder must be built first. (Updated 02/07/2024)
FROM ghcr.io/overte-org/overte-domain-server-docker/domain-server-builder:latest as build

LABEL maintainer="OfficialR3ido101 (https://github.com/OfficialR3ido101)"
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ Contained in this repo are two docker images which are used to build and run the

Also contained is a docker-compose.yml file to run the domain server on your server using docker-compose.

# Caveats

The assignment-client ports need to be published on the same port as they are listening on, since the domain-server doesn't know which ports are published and tells connecting clients the wrong ports otherwise.
This will work in most cases because of hole-punching, but more strict firewall setups will fail.

# Build Instructions

To build the domain server runtime image (Dockerfile.runtime), you must first build the overte server builder image (Dockerfile.build).
Expand Down