diff --git a/Dockerfile b/Dockerfile index b4b49c99..282222ca 100644 --- a/Dockerfile +++ b/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 @@ -6,8 +6,12 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" +# prevent Ubuntu's firefox stub from being installed +COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap + RUN \ echo "**** install packages ****" && \ + add-apt-repository -y ppa:mozillateam/ppa && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7080e6a3..246cf5c3 100644 --- a/Dockerfile.aarch64 +++ b/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 @@ -6,8 +6,12 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" +# prevent Ubuntu's firefox stub from being installed +COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap + RUN \ echo "**** install packages ****" && \ + add-apt-repository -y ppa:mozillateam/ppa && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d1d6d39f..601b7346 100644 --- a/Dockerfile.armhf +++ b/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 @@ -6,8 +6,12 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" +# prevent Ubuntu's firefox stub from being installed +COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap + RUN \ echo "**** install packages ****" && \ + add-apt-repository -y ppa:mozillateam/ppa && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ diff --git a/root/etc/apt/preferences.d/firefox-no-snap b/root/etc/apt/preferences.d/firefox-no-snap new file mode 100644 index 00000000..9406bcc0 --- /dev/null +++ b/root/etc/apt/preferences.d/firefox-no-snap @@ -0,0 +1,3 @@ +Package: firefox* +Pin: release o=Ubuntu* +Pin-Priority: -1