From 647156155cd95d9709fedf881a39ce497ba5a1a5 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Fri, 9 Feb 2024 12:59:09 +0000 Subject: [PATCH 01/23] add docker deployer --- .github/workflows/deploy.yaml | 40 +++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/deploy.yaml diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml new file mode 100644 index 0000000..c76805b --- /dev/null +++ b/.github/workflows/deploy.yaml @@ -0,0 +1,40 @@ +name: Build and Push Docker Image + +on: + push: + branches: + - main + +jobs: + build-and-push: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build and push Docker images + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile.build + push: true + tags: ghcr.io/${{ github.repository }}/domain-server-builder:latest + + - name: Build and push Docker images + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile.runtime + push: true + tags: ghcr.io/${{ github.repository }}/domain-server:latest \ No newline at end of file From 8a41d5da403cffe9b0a5bf8045f673a246b46046 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Fri, 9 Feb 2024 13:04:35 +0000 Subject: [PATCH 02/23] added zip because it was missing --- Dockerfile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.build b/Dockerfile.build index 9318647..01fd28e 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -11,7 +11,7 @@ RUN mkdir /opt/overte-build \ && mkdir /opt/overte # Install dependencies -RUN apt update && apt install -y 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 zip tzdata curl ninja-build git cmake g++ npm 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 From 8467e43b219225a5b632f6d1985da43d893b9b8a Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Fri, 9 Feb 2024 13:57:47 +0000 Subject: [PATCH 03/23] change runner size --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index c76805b..facc1e1 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -7,7 +7,7 @@ on: jobs: build-and-push: - runs-on: ubuntu-latest + runs-on: macos-13-xlarge steps: - name: Checkout code From 409856f27e5d34ce9a93fdaff0600c5f5adfcabf Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Fri, 9 Feb 2024 13:59:47 +0000 Subject: [PATCH 04/23] change runner size --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index facc1e1..8a12b76 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -7,7 +7,7 @@ on: jobs: build-and-push: - runs-on: macos-13-xlarge + runs-on: macos-13-large steps: - name: Checkout code From 8578482650cdd41ceb5ed3478288cebb62dcdb6d Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Fri, 9 Feb 2024 14:32:08 +0000 Subject: [PATCH 05/23] use own runner --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 8a12b76..aa56c03 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -7,7 +7,7 @@ on: jobs: build-and-push: - runs-on: macos-13-large + runs-on: self-hosted steps: - name: Checkout code From ea6b5f2a507a66197ec9f89f4fca946316c2a1cb Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Fri, 9 Feb 2024 14:38:12 +0000 Subject: [PATCH 06/23] update to work on self-hosted --- .github/workflows/deploy.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index aa56c03..a6f8213 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -11,20 +11,20 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Docker images - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . file: ./Dockerfile.build @@ -32,9 +32,9 @@ jobs: tags: ghcr.io/${{ github.repository }}/domain-server-builder:latest - name: Build and push Docker images - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . file: ./Dockerfile.runtime push: true - tags: ghcr.io/${{ github.repository }}/domain-server:latest \ No newline at end of file + tags: ghcr.io/${{ github.repository }}/domain-server:latest From 77cca16e557b7836931b2f1265d8b6087de21151 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Fri, 9 Feb 2024 16:05:09 +0000 Subject: [PATCH 07/23] make sure it uses all cores --- Dockerfile.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.build b/Dockerfile.build index 01fd28e..842cd91 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -25,8 +25,9 @@ RUN cd /opt/overte-build \ && export RELEASE_TYPE=PRODUCTION \ && cmake -DSERVER_ONLY=1 -DOVERTE_CPU_ARCHITECTURE=-msse3 .. +# put number after -j to limit cores. RUN cd /opt/overte-build/build \ - && make + && make -j RUN mv /opt/overte-build/build/libraries /opt/overte/libraries \ && mv /opt/overte-build/build/assignment-client/assignment-client /opt/overte/assignment-client \ From 5d2d07bc9188d84755345921d8f09eeac52a16d9 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sat, 10 Feb 2024 05:26:21 +0000 Subject: [PATCH 08/23] fix docker build error. --- .github/workflows/deploy.yaml | 50 +++++++++++++++++------------------ Dockerfile.runtime | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index a6f8213..f5299db 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,4 +1,4 @@ -name: Build and Push Docker Image +name: Build and Push Domain Server Images on: push: @@ -10,31 +10,31 @@ jobs: runs-on: self-hosted steps: - - name: Checkout code - uses: actions/checkout@v3 + - name: Checkout code + uses: actions/checkout@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push Docker images - uses: docker/build-push-action@v3 - with: - context: . - file: ./Dockerfile.build - push: true - tags: ghcr.io/${{ github.repository }}/domain-server-builder:latest + - name: Build and push Docker images + uses: docker/build-push-action@v3 + with: + context: . + file: ./Dockerfile.build + push: true + tags: ghcr.io/${{ github.repository }}/domain-server-builder:latest - - name: Build and push Docker images - uses: docker/build-push-action@v3 - with: - context: . - file: ./Dockerfile.runtime - push: true - tags: ghcr.io/${{ github.repository }}/domain-server:latest + - name: Build server runtime with compiled binaries + uses: docker/build-push-action@v3 + with: + context: . + file: ./Dockerfile.runtime + push: true + tags: ghcr.io/${{ github.repository }}/domain-server:latest \ No newline at end of file diff --git a/Dockerfile.runtime b/Dockerfile.runtime index 00200a1..0142737 100644 --- a/Dockerfile.runtime +++ b/Dockerfile.runtime @@ -1,5 +1,5 @@ # Overte Server runtime image. domain-server-builder must be built first. -FROM domain-server-builder as build +FROM ghcr.io/terminalx-resonite/overte-domain-server-docker/domain-server-builder:latest as build LABEL maintainer="Micah (https://github.com/akamicah)" LABEL description="Overte domain server runtime" From 1a1138ff075f0c108941f0d533554bb52431d2f9 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sat, 10 Feb 2024 06:44:51 +0000 Subject: [PATCH 09/23] disabled test and fixed naming scheme in deploy file --- .github/workflows/deploy.yaml | 2 +- Dockerfile.runtime | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index f5299db..fec9eff 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -23,7 +23,7 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push Docker images + - name: Create server builder uses: docker/build-push-action@v3 with: context: . diff --git a/Dockerfile.runtime b/Dockerfile.runtime index 0142737..b024a87 100644 --- a/Dockerfile.runtime +++ b/Dockerfile.runtime @@ -35,8 +35,8 @@ RUN chmod +x /opt/overte/domain-server && \ chmod +x /opt/overte/assignment-client # Server run test -RUN /opt/overte/domain-server --version > /opt/overte/version && \ - /opt/overte/assignment-client --version >> /opt/overte/version +# RUN /opt/overte/domain-server --version > /opt/overte/version && \ +# /opt/overte/assignment-client --version >> /opt/overte/version # Install supervisor config COPY ./files/overte.conf /etc/supervisor/conf.d/overte.conf From 6b27e6a67c4519197dd1581c99b978ba1942f7fd Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sat, 10 Feb 2024 08:47:38 +0000 Subject: [PATCH 10/23] add a wait time for the assignment clients --- files/overte.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/files/overte.conf b/files/overte.conf index a044d3a..72fdd9c 100644 --- a/files/overte.conf +++ b/files/overte.conf @@ -15,6 +15,7 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log +startsecs=30 [program:avatar-mixer] command=/opt/overte/assignment-client -t 1 -a localhost -p 48001 @@ -22,6 +23,7 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log +startsecs=30 [program:entities-server] command=/opt/overte/assignment-client -t 6 -a localhost -p 48006 @@ -29,6 +31,7 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log +startsecs=30 [program:asset-server] command=/opt/overte/assignment-client -t 3 -a localhost -p 48003 @@ -36,6 +39,7 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log +startsecs=30 [program:entity-script-server] command=/opt/overte/assignment-client -t 5 -a localhost -p 48005 @@ -43,6 +47,7 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log +startsecs=30 [program:messages-mixer] command=/opt/overte/assignment-client -t 4 -a localhost -p 48004 @@ -50,6 +55,7 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log +startsecs=30 [program:scripted-agent] command=/opt/overte/assignment-client -t 2 -a localhost --max 100 @@ -57,3 +63,4 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log +startsecs=30 From 8229b1cea738667609f627540a5824d6ea59c8ce Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sun, 11 Feb 2024 09:02:42 +0000 Subject: [PATCH 11/23] preserv build directory and removed 30sec delay from assignment clients --- Dockerfile.build | 1 + files/overte.conf | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index 842cd91..55e44cf 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -30,6 +30,7 @@ RUN cd /opt/overte-build/build \ && make -j RUN mv /opt/overte-build/build/libraries /opt/overte/libraries \ + && cp -r /opt/overte-build /opt/overte/build \ && 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 \ diff --git a/files/overte.conf b/files/overte.conf index 72fdd9c..50e9df2 100644 --- a/files/overte.conf +++ b/files/overte.conf @@ -31,7 +31,6 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log -startsecs=30 [program:asset-server] command=/opt/overte/assignment-client -t 3 -a localhost -p 48003 @@ -39,7 +38,6 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log -startsecs=30 [program:entity-script-server] command=/opt/overte/assignment-client -t 5 -a localhost -p 48005 @@ -47,7 +45,6 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log -startsecs=30 [program:messages-mixer] command=/opt/overte/assignment-client -t 4 -a localhost -p 48004 @@ -55,7 +52,6 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log -startsecs=30 [program:scripted-agent] command=/opt/overte/assignment-client -t 2 -a localhost --max 100 @@ -63,4 +59,4 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log -startsecs=30 + From a5bbd435dd632babe76dd998387cb62abf96d4d3 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sun, 11 Feb 2024 10:14:35 +0000 Subject: [PATCH 12/23] testing node setup... --- Dockerfile.runtime | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.runtime b/Dockerfile.runtime index b024a87..f49fd30 100644 --- a/Dockerfile.runtime +++ b/Dockerfile.runtime @@ -23,6 +23,7 @@ RUN apt clean && rm -rf /var/lib/app/lists/* # Install libraries COPY --from=build /opt/overte/libraries/*/*.so /lib/ +COPY --from=build /root/overte-files/vcpkg/77b4e5f4/installed/x64-linux/lib/libnode.so.108 /lib/ # Fetch built services RUN mkdir /opt/overte From 326ecb0daab68e77be839c01dd6d087ec6745262 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sun, 11 Feb 2024 10:18:13 +0000 Subject: [PATCH 13/23] forgot to copy stuff --- Dockerfile.runtime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.runtime b/Dockerfile.runtime index f49fd30..f77f5d2 100644 --- a/Dockerfile.runtime +++ b/Dockerfile.runtime @@ -23,7 +23,7 @@ RUN apt clean && rm -rf /var/lib/app/lists/* # Install libraries COPY --from=build /opt/overte/libraries/*/*.so /lib/ -COPY --from=build /root/overte-files/vcpkg/77b4e5f4/installed/x64-linux/lib/libnode.so.108 /lib/ +COPY --from=build /root/overte-files/vcpkg/77b4e5f4/installed/x64-linux/lib/* /lib/ # Fetch built services RUN mkdir /opt/overte From 071e56bae63ac2fa2b07d7fcb9b2c0f4f25babcc Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sun, 11 Feb 2024 10:19:35 +0000 Subject: [PATCH 14/23] removed not needed stuff from build --- Dockerfile.build | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile.build b/Dockerfile.build index 55e44cf..842cd91 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -30,7 +30,6 @@ RUN cd /opt/overte-build/build \ && make -j RUN mv /opt/overte-build/build/libraries /opt/overte/libraries \ - && cp -r /opt/overte-build /opt/overte/build \ && 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 \ From 9653ac58905f52345fb90f3b47303ce6d1f0fab9 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sun, 11 Feb 2024 10:50:07 +0000 Subject: [PATCH 15/23] updated maintainer --- Dockerfile.runtime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.runtime b/Dockerfile.runtime index f77f5d2..aa7fe6f 100644 --- a/Dockerfile.runtime +++ b/Dockerfile.runtime @@ -1,7 +1,7 @@ # Overte Server runtime image. domain-server-builder must be built first. FROM ghcr.io/terminalx-resonite/overte-domain-server-docker/domain-server-builder:latest as build -LABEL maintainer="Micah (https://github.com/akamicah)" +LABEL maintainer="OfficialR3ido101 (https://github.com/OfficialR3ido101)" LABEL description="Overte domain server runtime" FROM ubuntu:22.04 From 68fed481d8582f675e2fd0711e83b97ec0e82334 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sun, 11 Feb 2024 11:27:15 +0000 Subject: [PATCH 16/23] trying to fix node #1 --- Dockerfile.runtime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.runtime b/Dockerfile.runtime index aa7fe6f..9a83990 100644 --- a/Dockerfile.runtime +++ b/Dockerfile.runtime @@ -23,7 +23,7 @@ RUN apt clean && rm -rf /var/lib/app/lists/* # Install libraries COPY --from=build /opt/overte/libraries/*/*.so /lib/ -COPY --from=build /root/overte-files/vcpkg/77b4e5f4/installed/x64-linux/lib/* /lib/ +COPY --from=build /root/overte-files/vcpkg/77b4e5f4/installed/x64-linux/lib/libnode.so.108 /lib/ # Fetch built services RUN mkdir /opt/overte From 40f84cf604de4b979f8f79365ad3b82b130ac5e8 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sun, 11 Feb 2024 11:33:06 +0000 Subject: [PATCH 17/23] update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7483d2c..b377c87 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +# Build Status + +[![Docker Build](https://github.com/terminalx-resonite/overte-domain-server-docker/actions/workflows/deploy.yaml/badge.svg)](https://github.com/terminalx-resonite/overte-domain-server-docker/actions/workflows/deploy.yaml) + # Overte Domain Server Docker Images Contained in this repo are two docker images which are used to build and run the Overte domain server as a docker image. @@ -24,5 +28,5 @@ docker run -d --name overte-server -p 40100-40102:40100-40102 -p 40100-40102:401 # Prebuilt Image -If you would prefer, a prebuilt image for amd64 environments can be used by replacing `domain-server` with `akamicah/overte-domain-server:latest` in either the `docker run` command or the `docker-compose.yml` file. +If you would prefer, a prebuilt image for amd64 environments can be used by replacing `domain-server` with `ghcr.io/overte-org/overte-domain-server-docker/domain-server:latest` in either the `docker run` command or the `docker-compose.yml` file. From e36449fb228601cd71b35ae7a0e51556523b22d7 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sun, 11 Feb 2024 13:02:11 +0000 Subject: [PATCH 18/23] fixed docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1e321c7..eb700b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: overte-server: #image: domain-server - image: akamicah/overte-domain-server:latest + image: ghcr.io/terminalx-resonite/overte-domain-server-docker/domain-server:latest container_name: overte-server restart: unless-stopped expose: From d1d0bddd7934cbe8634c519a4fe449fcc4cb835e Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sun, 11 Feb 2024 13:04:10 +0000 Subject: [PATCH 19/23] make it match overte-org repo --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index eb700b6..d6fcb4e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: overte-server: #image: domain-server - image: ghcr.io/terminalx-resonite/overte-domain-server-docker/domain-server:latest + image: ghcr.io/overte-org/overte-domain-server-docker/domain-server:latest container_name: overte-server restart: unless-stopped expose: From 801aa46c7d4ada6bebcf093c1e6bdf5dcbccfe91 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Sun, 11 Feb 2024 23:54:35 +0000 Subject: [PATCH 20/23] changed from self-hosted to docker --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index fec9eff..8a80838 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -7,7 +7,7 @@ on: jobs: build-and-push: - runs-on: self-hosted + runs-on: docker steps: - name: Checkout code From 5135c1eb4a064a46a6b6742c4c8c720e34abc2ef Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 <39566484+OfficialR3ido101@users.noreply.github.com> Date: Mon, 26 Feb 2024 23:36:31 +0000 Subject: [PATCH 21/23] Integrated prebuild.py (#1) --- .github/workflows/deploy.yaml | 7 ------- Dockerfile.build | 12 +++++++----- Dockerfile.runtime | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 8a80838..4a6c8cd 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -23,13 +23,6 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Create server builder - uses: docker/build-push-action@v3 - with: - context: . - file: ./Dockerfile.build - push: true - tags: ghcr.io/${{ github.repository }}/domain-server-builder:latest - name: Build server runtime with compiled binaries uses: docker/build-push-action@v3 diff --git a/Dockerfile.build b/Dockerfile.build index 842cd91..50aa1a2 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,9 +1,6 @@ # Docker environment for building Overte server FROM ubuntu:22.04 -ARG REPO=https://github.com/overte-org/overte -ARG TAG=master - ARG DEBIAN_FRONTEND=noninteractive ARG TERM=linux @@ -11,11 +8,11 @@ RUN mkdir /opt/overte-build \ && mkdir /opt/overte # Install dependencies -RUN apt update && apt install -y 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++ npm 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 -RUN git clone --depth 1 --branch $TAG $REPO /opt/overte-build/ +RUN git clone https://github.com/overte-org/overte.git /opt/overte-build/ # Build just the server RUN cd /opt/overte-build \ @@ -29,6 +26,11 @@ RUN cd /opt/overte-build \ RUN cd /opt/overte-build/build \ && make -j +RUN VCPKG_PATH=$(python3 /opt/overte-build/prebuild.py --get-vcpkg-path --build-root . --quiet) && \ + echo "VCPKG Path: $VCPKG_PATH" && \ + find "$VCPKG_PATH" -type f -name "libnode.so.108" -exec cp {} /opt/overte-build/build/libraries \; || \ + echo "libnode.so.108 not found in $VCPKG_PATH" + 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 \ diff --git a/Dockerfile.runtime b/Dockerfile.runtime index 9a83990..6d5d9e5 100644 --- a/Dockerfile.runtime +++ b/Dockerfile.runtime @@ -23,7 +23,7 @@ RUN apt clean && rm -rf /var/lib/app/lists/* # Install libraries COPY --from=build /opt/overte/libraries/*/*.so /lib/ -COPY --from=build /root/overte-files/vcpkg/77b4e5f4/installed/x64-linux/lib/libnode.so.108 /lib/ +COPY --from=build /opt/overte/libraries/libnode.so.108 /lib/ # Fetch built services RUN mkdir /opt/overte From 24f9f94ba53559c6a7f495e519349ba2fab2db6b Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 <39566484+OfficialR3ido101@users.noreply.github.com> Date: Mon, 26 Feb 2024 23:43:18 +0000 Subject: [PATCH 22/23] Fixing the runner image (#2) * trying to remove root #1 * tesitng * de-rooting 2 test * de-root test #2 * de-root #3 * added pyton3 de-root #4 * hardcode path de-root #5 * forced to only master de-root #5 * removed env arguments that are not needed. * temp check on dale's repo de-root #6 * forgot space * de-rooting * de-root * de-root * de-root #8 * removed builder image and get it ready for pr * removed unneeded stuff * Will this this to run * prepping the runtime dockerfile for overte-org --- Dockerfile.runtime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.runtime b/Dockerfile.runtime index 6d5d9e5..492ec00 100644 --- a/Dockerfile.runtime +++ b/Dockerfile.runtime @@ -1,5 +1,5 @@ # Overte Server runtime image. domain-server-builder must be built first. -FROM ghcr.io/terminalx-resonite/overte-domain-server-docker/domain-server-builder:latest as build +FROM ghcr.io/overte-org/overte-domain-server-docker/domain-server-builder:latest as build LABEL maintainer="OfficialR3ido101 (https://github.com/OfficialR3ido101)" LABEL description="Overte domain server runtime" From 5143563ca171db781805f396ffa7aa9f6623a326 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 <39566484+OfficialR3ido101@users.noreply.github.com> Date: Tue, 27 Feb 2024 00:07:38 +0000 Subject: [PATCH 23/23] removed delay's (#3) --- files/overte.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/files/overte.conf b/files/overte.conf index 50e9df2..c4c65e2 100644 --- a/files/overte.conf +++ b/files/overte.conf @@ -15,7 +15,6 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log -startsecs=30 [program:avatar-mixer] command=/opt/overte/assignment-client -t 1 -a localhost -p 48001 @@ -23,7 +22,6 @@ autorestart=unexpected directory=/opt/overte stderr_logfile=/var/log/overte-err.log stdout_logfile=/var/log/overte-out.log -startsecs=30 [program:entities-server] command=/opt/overte/assignment-client -t 6 -a localhost -p 48006