Skip to content

Commit d961823

Browse files
authored
Dodanie zmiennych środowiskowych i wolumenu odpowiedzialnych (#174)
za wspóldzielenie serwera wyświetlania Wayland między hostem Linuksowym a kontenerem Dockerowym. (Kontekst: Ubunt 25.10 usunęło zupełnie wsparcie dla Gnome na X11, więcej: https://discourse.ubuntu.com/t/ubuntu-25-10-drops-support-for-gnome-on-xorg/62538)
1 parent 77343f4 commit d961823

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
# Alinka PySide
22

3-
## Development
4-
5-
If you're using Docker Compose (or Linux in general) for development, be aware
6-
that Waylaynd as Windows System is causing issues and it would be wise
7-
to switch X11 (see procedure in https://apploye.com/help/switch-from-wayland-to-xorg-ubuntu/).
8-
93
## Release
104
To make a release please follow instruction
115
1. Go to "Actions" tab and run "Crate release" workflow (additional instructions [here](https://docs.github.com/en/actions/how-tos/managing-workflow-runs-and-deployments/managing-workflow-runs/manually-running-a-workflow#running-a-workflow)).

docker-compose.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
services:
22
app:
33
environment:
4-
- DISPLAY=$DISPLAY
4+
# X11 (legacy)
5+
- DISPLAY=$DISPLAY
6+
# Wayland
7+
- XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR
8+
- WAYLAND_DISPLAY=$WAYLAND_DISPLAY
59
container_name: alinka-linux
610
build:
711
context: .
@@ -10,9 +14,14 @@ services:
1014
command: python run.py
1115

1216
volumes:
13-
- ".:/app/"
14-
- "/tmp/.X11-unix:/tmp/.X11-unix"
15-
- "./.volumes/data:/home/qtuser/.local/share/Alinka"
16-
- "./.volumes/documents:/home/qtuser/Documents/Alinka"
17+
# source code
18+
- ".:/app/"
19+
# X11 (legacy)
20+
- "/tmp/.X11-unix:/tmp/.X11-unix"
21+
# Wayland
22+
- "${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY}:${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY}"
23+
# data
24+
- "./.volumes/data:/home/qtuser/.local/share/Alinka"
25+
- "./.volumes/documents:/home/qtuser/Documents/Alinka"
1726

1827
user: qtuser

0 commit comments

Comments
 (0)