From 5c5836aa7f1e6bd7f9bb1ab89ab5f0f5b9e76dc5 Mon Sep 17 00:00:00 2001 From: Erik De Rijcke Date: Thu, 2 Nov 2023 20:55:46 +0100 Subject: [PATCH] more wip --- .../alacritty/10_nvidia.json | 0 .../alacritty/Dockerfile | 0 .../alacritty/alacritty.yml | 0 examples/docker-compose/applications.json | 20 ++++++++ .../docker-compose}/docker-compose.yml | 46 +++++++++---------- .../glxgears/Dockerfile | 0 .../gtk3-demo/Dockerfile | 0 .../gtk4-demo/10_nvidia.json | 0 .../gtk4-demo/Dockerfile | 0 .../xterm/Dockerfile | 0 packages/compositor/README.md | 18 -------- 11 files changed, 43 insertions(+), 41 deletions(-) rename examples/{docker-apps => docker-compose}/alacritty/10_nvidia.json (100%) rename examples/{docker-apps => docker-compose}/alacritty/Dockerfile (100%) rename examples/{docker-apps => docker-compose}/alacritty/alacritty.yml (100%) create mode 100644 examples/docker-compose/applications.json rename {docker => examples/docker-compose}/docker-compose.yml (73%) rename examples/{docker-apps => docker-compose}/glxgears/Dockerfile (100%) rename examples/{docker-apps => docker-compose}/gtk3-demo/Dockerfile (100%) rename examples/{docker-apps => docker-compose}/gtk4-demo/10_nvidia.json (100%) rename examples/{docker-apps => docker-compose}/gtk4-demo/Dockerfile (100%) rename examples/{docker-apps => docker-compose}/xterm/Dockerfile (100%) delete mode 100644 packages/compositor/README.md diff --git a/examples/docker-apps/alacritty/10_nvidia.json b/examples/docker-compose/alacritty/10_nvidia.json similarity index 100% rename from examples/docker-apps/alacritty/10_nvidia.json rename to examples/docker-compose/alacritty/10_nvidia.json diff --git a/examples/docker-apps/alacritty/Dockerfile b/examples/docker-compose/alacritty/Dockerfile similarity index 100% rename from examples/docker-apps/alacritty/Dockerfile rename to examples/docker-compose/alacritty/Dockerfile diff --git a/examples/docker-apps/alacritty/alacritty.yml b/examples/docker-compose/alacritty/alacritty.yml similarity index 100% rename from examples/docker-apps/alacritty/alacritty.yml rename to examples/docker-compose/alacritty/alacritty.yml diff --git a/examples/docker-compose/applications.json b/examples/docker-compose/applications.json new file mode 100644 index 00000000..dd400a11 --- /dev/null +++ b/examples/docker-compose/applications.json @@ -0,0 +1,20 @@ +{ + "/gtk4-demo": { + "name": "GTK4 Demo", + "executable": "gtk4-demo", + "args": [], + "env": {} + }, + "/gtk3-demo": { + "name": "GTK3 Demo", + "executable": "gtk3-demo", + "args": [], + "env": {} + }, + "/xterm": { + "name": "XTerm", + "executable": "xterm", + "args": [], + "env": {} + } +} diff --git a/docker/docker-compose.yml b/examples/docker-compose/docker-compose.yml similarity index 73% rename from docker/docker-compose.yml rename to examples/docker-compose/docker-compose.yml index f443c8c3..a7d886e1 100644 --- a/docker/docker-compose.yml +++ b/examples/docker-compose/docker-compose.yml @@ -1,15 +1,16 @@ #Uncomment nvidia related comments below if you want hw acceleration with an nvidia GPU to work inside the containers (requires nvidia container runtime). #Also make sure to configure "/dev/dri/renderD12x" and "/dev/dri/cardx" entries in this file to point to the correct GPU if you have a multi GPU setup. -#The config.yaml file inside the src directory also needs to be adjusted to point to the correct GPU. -#Note that nvidia driver support on Wayland is still very much incomplete. +#The compositor-proxy-cli command also needs to point to the correct GPU. services: - compositor-proxy: + compositor-proxy-cli: # runtime: nvidia build: - context: ../packages/compositor-proxy-cli - dockerfile: Dockerfile + context: ../.. + dockerfile: docker/Dockerfile command: - - --session-id=test123 +# - --encoder=nvh264 + - --applications=applications.json + - --render-device=/dev/dri/renderD128 privileged: false user: "1000:1000" ipc: host @@ -17,7 +18,7 @@ services: volumes: - xdg-runtime-dir:/xdg-runtime-dir - x11-unix:/tmp/.X11-unix - - ${PWD}/src/config.yaml:/app/dist/config.yaml + - ${PWD}/docker-compose-applications.json:/app/docker-compose-applications.json - /dev/dri/renderD128:/dev/dri/renderD128:rw - /dev/dri/card0:/dev/dri/card0:rw devices: @@ -26,17 +27,16 @@ services: ports: - "8081:8081/tcp" environment: - COMPOSITOR_SESSION_ID: test123 XDG_RUNTIME_DIR: /xdg-runtime-dir XAUTHORITY: /tmp/.X11-unix/Xauthority # NVIDIA_VISIBLE_DEVICES: all # NVIDIA_DRIVER_CAPABILITIES: all gtk3-demo: # runtime: nvidia - pid: 'service:compositor-proxy' + pid: 'service:compositor-proxy-cli' build: - context: ../examples/docker-apps/gtk3-demo - dockerfile: packages/compositor-proxy-cli/example-apps/gtk3-demo/Dockerfile + context: gtk3-demo + dockerfile: Dockerfile privileged: false user: "1000:1000" volumes: @@ -51,10 +51,10 @@ services: restart: always gtk4-demo: # runtime: nvidia - pid: 'service:compositor-proxy' + pid: 'service:compositor-proxy-cli' build: - context: ../examples/docker-apps/gtk4-demo - dockerfile: packages/compositor-proxy-cli/example-apps/gtk4-demo/Dockerfile + context: gtk4-demo + dockerfile: Dockerfile privileged: false user: "1000:1000" volumes: @@ -69,10 +69,10 @@ services: restart: always alacritty: # runtime: nvidia - pid: 'service:compositor-proxy' + pid: 'service:compositor-proxy-cli' build: - context: ../examples/docker-apps/alacritty - dockerfile: packages/compositor-proxy-cli/example-apps/alacritty/Dockerfile + context: alacritty + dockerfile: Dockerfile privileged: false user: "1000:1000" volumes: @@ -88,10 +88,10 @@ services: restart: always xterm: # runtime: nvidia - pid: 'service:compositor-proxy' + pid: 'service:compositor-proxy-cli' build: - context: ../examples/docker-apps/xterm - dockerfile: packages/compositor-proxy-cli/example-apps/xterm/Dockerfile + context: xterm + dockerfile: Dockerfile privileged: false user: "1000:1000" volumes: @@ -109,10 +109,10 @@ services: restart: always glxgears: # runtime: nvidia - pid: 'service:compositor-proxy' + pid: 'service:compositor-proxy-cli' build: - context: ../examples/docker-apps/glxgears - dockerfile: packages/compositor-proxy-cli/example-apps/glxgears/Dockerfile + context: glxgears + dockerfile: Dockerfile ipc: host privileged: false user: "1000:1000" diff --git a/examples/docker-apps/glxgears/Dockerfile b/examples/docker-compose/glxgears/Dockerfile similarity index 100% rename from examples/docker-apps/glxgears/Dockerfile rename to examples/docker-compose/glxgears/Dockerfile diff --git a/examples/docker-apps/gtk3-demo/Dockerfile b/examples/docker-compose/gtk3-demo/Dockerfile similarity index 100% rename from examples/docker-apps/gtk3-demo/Dockerfile rename to examples/docker-compose/gtk3-demo/Dockerfile diff --git a/examples/docker-apps/gtk4-demo/10_nvidia.json b/examples/docker-compose/gtk4-demo/10_nvidia.json similarity index 100% rename from examples/docker-apps/gtk4-demo/10_nvidia.json rename to examples/docker-compose/gtk4-demo/10_nvidia.json diff --git a/examples/docker-apps/gtk4-demo/Dockerfile b/examples/docker-compose/gtk4-demo/Dockerfile similarity index 100% rename from examples/docker-apps/gtk4-demo/Dockerfile rename to examples/docker-compose/gtk4-demo/Dockerfile diff --git a/examples/docker-apps/xterm/Dockerfile b/examples/docker-compose/xterm/Dockerfile similarity index 100% rename from examples/docker-apps/xterm/Dockerfile rename to examples/docker-compose/xterm/Dockerfile diff --git a/packages/compositor/README.md b/packages/compositor/README.md deleted file mode 100644 index 8f76e140..00000000 --- a/packages/compositor/README.md +++ /dev/null @@ -1,18 +0,0 @@ -## About - -The HTML5 Wayland compositor library for Greenfield. - -## Building - -Simply run: - -- `yarn install` - -## Usage - -run. -- `yarn start` - -Go to [http://localhost:8080]() and be greeted with a nice compositor running entirely in your browser! It has a URL input -field that can be used in the same way as you would with a browser. Simply type the url of a proxy endpoint and press enter. -