Merge pull request #101 from linuxserver/jammy

rebase calibre to jammy, switch to s6v3

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:focal
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:jammy
 
 # set version label
 ARG BUILD_DATE
@@ -22,7 +22,7 @@ RUN \
     jq \
     libnss3 \
     libopengl0 \
-    libqpdf26 \
+    libqpdf28 \
     libxkbcommon-x11-0 \
     libxcb-icccm4 \
     libxcb-image0 \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-focal
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -22,7 +22,7 @@ RUN \
     jq \
     libnss3 \
     libopengl0 \
-    libqpdf26 \
+    libqpdf28 \
     libxkbcommon-x11-0 \
     libxcb-icccm4 \
     libxcb-image0 \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-focal
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -10,4 +10,14 @@ LABEL maintainer="aptalca"
 # add local files
 COPY root-armhf/ /
 
+# prevent baseimage services from starting
+RUN \
+  cd /etc/s6-overlay/s6-rc.d/user/contents.d && \
+  rm -rf \
+    svc-autostart \
+    svc-guacd \
+    svc-web \
+    svc-xrdp \
+    svc-xrdp-sesman
+
 # This Calibre image does not support 32 bit ARM due to lack of upstream support

README.md

@@ -81,6 +81,8 @@ services:
   calibre:
     image: lscr.io/linuxserver/calibre:latest
     container_name: calibre
+    security_opt:
+      - seccomp:unconfined #optional
     environment:
       - PUID=1000
       - PGID=1000
@@ -100,6 +102,7 @@ services:
 ```bash
 docker run -d \
   --name=calibre \
+  --security-opt seccomp=unconfined `#optional` \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Europe/London \
@@ -126,6 +129,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PASSWORD=` | Optionally set a password for the gui. |
 | `-e CLI_ARGS=` | Optionally pass cli start arguments to calibre. |
 | `-v /config` | Where calibre should store its database and library. |
+| `--security-opt seccomp=unconfined` | For Docker Engine only, many modern gui apps need this to function as syscalls are unkown to Docker. |
 
 ## Environment variables from files (Docker secrets)
 
@@ -236,6 +240,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **16.09.22:** - Rebase to jammy.
 * **24.07.22:** - Add arm64 build for master branch.
 * **11.07.22:** - Update dependencies for Calibre 6.
 * **28.05.22:** - Rebase to focal.

readme-vars.yml

@@ -44,6 +44,9 @@ opt_param_usage_include_ports: false
 opt_param_device_map: false
 opt_cap_add_param: false
 optional_block_1: false
+opt_security_opt_param: true
+opt_security_opt_param_vars:
+  - { run_var: "seccomp=unconfined", compose_var: "seccomp:unconfined", desc: "For Docker Engine only, many modern gui apps need this to function as syscalls are unkown to Docker." }
 
 # application setup block
 app_setup_block_enabled: true
@@ -57,6 +60,7 @@ app_setup_block: |
   You can access advanced features of the Guacamole remote desktop using `ctrl`+`alt`+`shift` enabling you to use remote copy/paste and different languages.
 # changelog
 changelogs:
+  - { date: "16.09.22:", desc: "Rebase to jammy." }
   - { date: "24.07.22:", desc: "Add arm64 build for master branch." }
   - { date: "11.07.22:", desc: "Update dependencies for Calibre 6." }
   - { date: "28.05.22:", desc: "Rebase to focal." }

root-armhf/etc/s6-overlay/s6-rc.d/init-calibre-config/type

@@ -0,0 +1 @@
+oneshot

root-armhf/etc/s6-overlay/s6-rc.d/init-calibre-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-calibre-config/run

root/etc/s6-overlay/s6-rc.d/init-calibre-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-calibre-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-calibre-config/run