mirror of
https://github.com/linuxserver/docker-webtop.git
synced 2025-07-22 21:25:03 +02:00
rebase xfce to jammy (#90)
Co-authored-by: ryan.kuba <ryan.kuba@kasmweb.com>
This commit is contained in:
parent
cfdc7e23f1
commit
8b64169fed
@ -1,4 +1,4 @@
|
|||||||
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:focal
|
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:jammy
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
@ -6,8 +6,12 @@ ARG VERSION
|
|||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
LABEL maintainer="thelamer"
|
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 \
|
RUN \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
|
add-apt-repository -y ppa:mozillateam/ppa && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
DEBIAN_FRONTEND=noninteractive \
|
DEBIAN_FRONTEND=noninteractive \
|
||||||
apt-get install --no-install-recommends -y \
|
apt-get install --no-install-recommends -y \
|
||||||
|
@ -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
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
@ -6,8 +6,12 @@ ARG VERSION
|
|||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
LABEL maintainer="thelamer"
|
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 \
|
RUN \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
|
add-apt-repository -y ppa:mozillateam/ppa && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
DEBIAN_FRONTEND=noninteractive \
|
DEBIAN_FRONTEND=noninteractive \
|
||||||
apt-get install --no-install-recommends -y \
|
apt-get install --no-install-recommends -y \
|
||||||
|
@ -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
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
@ -6,8 +6,12 @@ ARG VERSION
|
|||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
LABEL maintainer="thelamer"
|
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 \
|
RUN \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
|
add-apt-repository -y ppa:mozillateam/ppa && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
DEBIAN_FRONTEND=noninteractive \
|
DEBIAN_FRONTEND=noninteractive \
|
||||||
apt-get install --no-install-recommends -y \
|
apt-get install --no-install-recommends -y \
|
||||||
|
3
root/etc/apt/preferences.d/firefox-no-snap
Normal file
3
root/etc/apt/preferences.d/firefox-no-snap
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Package: firefox*
|
||||||
|
Pin: release o=Ubuntu*
|
||||||
|
Pin-Priority: -1
|
Loading…
x
Reference in New Issue
Block a user