mirror of
https://github.com/linuxserver/docker-inkscape.git
synced 2026-01-09 07:31:16 +08:00
add wayland init
This commit is contained in:
thelamer
parent
dcda0a59d7
commit
b0cedd0843
@ -1,6 +1,6 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-selkies:alpine322
|
||||
FROM ghcr.io/linuxserver/baseimage-selkies:alpine323
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -19,7 +19,7 @@ RUN \
|
||||
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/inkscape-logo.png && \
|
||||
echo "**** install packages ****" && \
|
||||
if [ -z ${INKSCAPE_VERSION+x} ]; then \
|
||||
INKSCAPE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
|
||||
INKSCAPE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
|
||||
&& awk '/^P:inkscape$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
|
||||
fi && \
|
||||
apk add --no-cache \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-alpine322
|
||||
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-alpine323
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -19,7 +19,7 @@ RUN \
|
||||
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/inkscape-logo.png && \
|
||||
echo "**** install packages ****" && \
|
||||
if [ -z ${INKSCAPE_VERSION+x} ]; then \
|
||||
INKSCAPE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
|
||||
INKSCAPE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
|
||||
&& awk '/^P:inkscape$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
|
||||
fi && \
|
||||
apk add --no-cache \
|
||||
|
||||
26
README.md
26
README.md
@ -88,6 +88,7 @@ This container is based on [Docker Baseimage Selkies](https://github.com/linuxse
|
||||
|
||||
| Variable | Description |
|
||||
| :----: | --- |
|
||||
| PIXELFLUX_WAYLAND | **Experimental** If set to true the container will initialize in Wayland mode running [Smithay](https://github.com/Smithay/smithay) and Labwc while enabling zero copy encoding with a GPU |
|
||||
| CUSTOM_PORT | Internal port the container listens on for http if it needs to be swapped from the default `3000` |
|
||||
| CUSTOM_HTTPS_PORT | Internal port the container listens on for https if it needs to be swapped from the default `3001` |
|
||||
| CUSTOM_WS_PORT | Internal port the container listens on for websockets if it needs to be swapped from the default 8082 |
|
||||
@ -142,6 +143,30 @@ To launch the desktop session in a different language, set the `LC_ALL` environm
|
||||
* `-e LC_ALL=nl_NL.UTF-8` - Netherlands
|
||||
* `-e LC_ALL=it_IT.UTF-8` - Italian
|
||||
|
||||
### SealSkin Compatibility
|
||||
|
||||
This container is compatible with [SealSkin](https://github.com/linuxserver/docker-sealskin).
|
||||
|
||||
SealSkin is a self-hosted, client-server platform that provides secure authentication and collaboration features while using a browser extension to intercept user actions such as clicking a link or downloading a file and redirect them to a secure, isolated application environment running on a remote server.
|
||||
|
||||
* **SealSkin Server:** [Get it Here](https://github.com/linuxserver/docker-sealskin)
|
||||
* **Browser Extension:** [Install Here](https://chromewebstore.google.com/detail/sealskin-isolation/lclgfmnljgacfdpmmmjmfpdelndbbfhk)
|
||||
|
||||
### All GPU Acceleration - use sane resolutions
|
||||
|
||||
When using 3d acceleration via Nvidia DRM or DRI3 it is important to clamp the virtual display to a reasonable max resolution. This can be achieved with the environment setting:
|
||||
|
||||
* `-e MAX_RESOLUTION=3840x2160`
|
||||
|
||||
This will set the total virtual framebuffer to 4K, you can also set a manual resolution to achieve this.
|
||||
By default the virtual monitor in the session is 16K to support large monitors and dual display configurations. Leaving it this large has no impact on CPU based performance but costs GPU memory usage and memory bandwidth when leveraging one for acceleration. If you have performance issues in an accelerated session, try clamping the resolution to 1080p and work up from there:
|
||||
|
||||
```
|
||||
-e SELKIES_MANUAL_WIDTH=1920
|
||||
-e SELKIES_MANUAL_HEIGHT=1080
|
||||
-e MAX_RESOLUTION=1920x1080
|
||||
```
|
||||
|
||||
### DRI3 GPU Acceleration
|
||||
|
||||
For accelerated apps or games, render devices can be mounted into the container and leveraged by applications using:
|
||||
@ -531,6 +556,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **28.12.25:** - Add Wayland init logic, rebase to Alpine 3.23.
|
||||
* **12.07.25:** - Rebase to Selkies and Alpine 3.22, HTTPS IS NOW REQUIRED.
|
||||
* **06.12.24:** - Rebase to Alpine 3.21.
|
||||
* **23.05.24:** - Rebase to Alpine 3.20.
|
||||
|
||||
@ -16,8 +16,8 @@ repo_vars:
|
||||
- DEV_DOCKERHUB_IMAGE = 'lsiodev/inkscape'
|
||||
- PR_DOCKERHUB_IMAGE = 'lspipepr/inkscape'
|
||||
- DIST_IMAGE = 'alpine'
|
||||
- DIST_TAG = '3.22'
|
||||
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/community/'
|
||||
- DIST_TAG = '3.23'
|
||||
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.23/community/'
|
||||
- DIST_REPO_PACKAGES = 'inkscape'
|
||||
- MULTIARCH = 'true'
|
||||
- CI = 'true'
|
||||
|
||||
@ -102,6 +102,7 @@ init_diagram: |
|
||||
"inkscape:latest" <- Base Images
|
||||
# changelog
|
||||
changelogs:
|
||||
- {date: "28.12.25:", desc: "Add Wayland init logic, rebase to Alpine 3.23."}
|
||||
- {date: "12.07.25:", desc: "Rebase to Selkies and Alpine 3.22, HTTPS IS NOW REQUIRED."}
|
||||
- {date: "06.12.24:", desc: "Rebase to Alpine 3.21."}
|
||||
- {date: "23.05.24:", desc: "Rebase to Alpine 3.20."}
|
||||
|
||||
5
root/defaults/autostart_wayland
Normal file
5
root/defaults/autostart_wayland
Normal file
@ -0,0 +1,5 @@
|
||||
if [ ! -f $HOME/.config/inkscape/preferences.xml ]; then
|
||||
mkdir -p $HOME/.config/inkscape
|
||||
cp /defaults/preferences.xml $HOME/.config/inkscape/preferences.xml
|
||||
fi
|
||||
inkscape
|
||||
7
root/defaults/menu_wayland.xml
Normal file
7
root/defaults/menu_wayland.xml
Normal file
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openbox_menu xmlns="http://openbox.org/3.4/menu">
|
||||
<menu id="root-menu" label="MENU">
|
||||
<item label="foot" icon="/usr/share/icons/hicolor/48x48/apps/foot.png"><action name="Execute"><command>/usr/bin/foot</command></action></item>
|
||||
<item label="Inkscape" icon="/usr/share/icons/hicolor/48x48/apps/org.inkscape.Inkscape.png"><action name="Execute"><command>/usr/bin/inkscape</command></action></item>
|
||||
</menu>
|
||||
</openbox_menu>
|
||||
@ -1,7 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<inkscape version="1" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd">
|
||||
<group id="options" rotationlock="1">
|
||||
<group id="boot" theme="colorful" enabled="0">
|
||||
<group id="boot" theme="colorful" mode="0">
|
||||
<group id="shown" ver1.4.2="1" />
|
||||
</group>
|
||||
</group>
|
||||
</inkscape>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user