more wip

udevbe · Nov 1, 2023 · d5cc293 · d5cc293
1 parent bc83b12
commit d5cc293
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
 #    runtime: nvidia
     pid: 'service:compositor-proxy'
     build:
-      context: packages/compositor-proxy-cli/example-apps/gtk3-demo
+      context: examples/docker-apps/gtk3-demo
       dockerfile: packages/compositor-proxy-cli/example-apps/gtk3-demo/Dockerfile
     privileged: false
     user: "1000:1000"
@@ -53,7 +53,7 @@ services:
 #    runtime: nvidia
     pid: 'service:compositor-proxy'
     build:
-      context: packages/compositor-proxy-cli/example-apps/gtk4-demo
+      context: examples/docker-apps/gtk4-demo
       dockerfile: packages/compositor-proxy-cli/example-apps/gtk4-demo/Dockerfile
     privileged: false
     user: "1000:1000"
@@ -71,7 +71,7 @@ services:
 #    runtime: nvidia
     pid: 'service:compositor-proxy'
     build:
-      context: packages/compositor-proxy-cli/example-apps/alacritty
+      context: examples/docker-apps/alacritty
       dockerfile: packages/compositor-proxy-cli/example-apps/alacritty/Dockerfile
     privileged: false
     user: "1000:1000"
@@ -90,7 +90,7 @@ services:
 #    runtime: nvidia
     pid: 'service:compositor-proxy'
     build:
-      context: packages/compositor-proxy-cli/example-apps/xterm
+      context: examples/docker-apps/xterm
       dockerfile: packages/compositor-proxy-cli/example-apps/xterm/Dockerfile
     privileged: false
     user: "1000:1000"
@@ -111,7 +111,7 @@ services:
 #    runtime: nvidia
     pid: 'service:compositor-proxy'
     build:
-      context: packages/compositor-proxy-cli/example-apps/glxgears
+      context: examples/docker-apps/glxgears
       dockerfile: packages/compositor-proxy-cli/example-apps/glxgears/Dockerfile
     ipc: host
     privileged: false

diff --git a/...cli/example-apps/alacritty/10_nvidia.json → ...ples/docker-apps/alacritty/10_nvidia.json b/...cli/example-apps/alacritty/10_nvidia.json → ...ples/docker-apps/alacritty/10_nvidia.json
diff --git a/...oxy-cli/example-apps/alacritty/Dockerfile → examples/docker-apps/alacritty/Dockerfile b/...oxy-cli/example-apps/alacritty/Dockerfile → examples/docker-apps/alacritty/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.18.4
 
 RUN apk add --no-cache \
     font-noto \

diff --git a/...-cli/example-apps/alacritty/alacritty.yml → examples/docker-apps/alacritty/alacritty.yml b/...-cli/example-apps/alacritty/alacritty.yml → examples/docker-apps/alacritty/alacritty.yml
diff --git a/...roxy-cli/example-apps/glxgears/Dockerfile → examples/docker-apps/glxgears/Dockerfile b/...roxy-cli/example-apps/glxgears/Dockerfile → examples/docker-apps/glxgears/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:bookworm-20231030-slim
 RUN sed -i'' -e 's/main$/main contrib non-free/g' /etc/apt/sources.list.d/debian.sources
 RUN apt-get update && apt-get install -y \
     libopengl0 \

diff --git a/...oxy-cli/example-apps/gtk3-demo/Dockerfile → examples/docker-apps/gtk3-demo/Dockerfile b/...oxy-cli/example-apps/gtk3-demo/Dockerfile → examples/docker-apps/gtk3-demo/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:bookworm-20231030-slim
 
 RUN apt-get update && apt-get install -y \
     gtk-3-examples \

diff --git a/...cli/example-apps/gtk4-demo/10_nvidia.json → ...ples/docker-apps/gtk4-demo/10_nvidia.json b/...cli/example-apps/gtk4-demo/10_nvidia.json → ...ples/docker-apps/gtk4-demo/10_nvidia.json
diff --git a/...oxy-cli/example-apps/gtk4-demo/Dockerfile → examples/docker-apps/gtk4-demo/Dockerfile b/...oxy-cli/example-apps/gtk4-demo/Dockerfile → examples/docker-apps/gtk4-demo/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:bookworm-20231030-slim
 
 RUN apt-get update && apt-get install -y \
     libopengl0 \

diff --git a/...r-proxy-cli/example-apps/xterm/Dockerfile → examples/docker-apps/xterm/Dockerfile b/...r-proxy-cli/example-apps/xterm/Dockerfile → examples/docker-apps/xterm/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:bookworm-20231030-slim
 
 RUN apt-get update && apt-get install -y \
     xterm \