Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to noble #15

Merged
merged 1 commit into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/call-baseimage-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
with:
repo_owner: ${{ github.repository_owner }}
baseimage: "kasmvnc"
basebranch: "ubuntujammy"
basebranch: "ubuntunoble"
app_name: "nomacs"
secrets:
repo_release_token: ${{ secrets.repo_release_token }}
15 changes: 8 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntujammy
FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble

ARG BUILD_DATE
ARG VERSION
Expand Down Expand Up @@ -42,13 +42,13 @@ RUN \
kimageformat-plugins \
libexiv2-27 \
libheif1 \
libopencv-core4.5d \
libopencv-imgproc4.5d \
libquazip5-1 \
libqt5concurrent5 \
libqt5printsupport5 \
libopencv-core406t64 \
libopencv-imgproc406t64 \
libquazip5-1t64 \
libqt5concurrent5t64 \
libqt5printsupport5t64 \
libqt5svg5 \
libraw20 \
libraw23t64 \
qt5-image-formats-plugins && \
echo "**** compile heif plugin ****" && \
mkdir -p /tmp/heif && \
Expand All @@ -72,6 +72,7 @@ RUN \
make && \
make install && \
ldconfig && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** clean up ****" && \
apt-get purge --auto-remove -y \
build-essential \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **20.11.24:** - Rebase to noble.
* **11.02.24:** - Add PWA icon, rely on baseimage's fullscreen fix.
* **10.05.23:** - Build commits from upstream master branch.
* **27.03.23:** - Rebase to the new kasmvnc baseimage. Deprecate arm32v7 build as the new base does not support it.
Expand Down
2 changes: 1 addition & 1 deletion root/defaults/menu.xml
Original file line number Diff line number Diff line change
@@ -1,7 +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="Nomacs"><action name="Execute"><command>/usr/local/bin/nomacs</command></action></item>
<item label="Nomacs" icon="/usr/local/share/icons/hicolor/scalable/apps/org.nomacs.ImageLounge.svg"><action name="Execute"><command>/usr/local/bin/nomacs</command></action></item>
<item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
</menu>
</openbox_menu>