mirror of
https://github.com/ThePhaseless/Byparr.git
synced 2025-03-15 09:50:20 +08:00
remove novnc
This commit is contained in:
Thephaseless
parent
65f91c3a68
commit
45fbcf20f5
@ -5,9 +5,8 @@ services:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
environment:
|
||||
- LOG_LEVEL=DEBUG
|
||||
- LOG_LEVEL=INFO
|
||||
ports:
|
||||
- "8191:8191"
|
||||
- "6080:6080"
|
||||
volumes:
|
||||
- ./screenshots:/app/screenshots
|
||||
|
||||
76
novnc.sh
76
novnc.sh
@ -30,12 +30,7 @@ package_list="
|
||||
xdg-utils \
|
||||
fbautostart \
|
||||
at-spi2-core \
|
||||
xterm \
|
||||
eterm \
|
||||
nautilus\
|
||||
mousepad \
|
||||
seahorse \
|
||||
gnome-icon-theme \
|
||||
gnome-keyring \
|
||||
libx11-dev \
|
||||
libxkbfile-dev \
|
||||
@ -44,9 +39,6 @@ package_list="
|
||||
libnotify4 \
|
||||
libnss3 \
|
||||
libxss1 \
|
||||
xfonts-base \
|
||||
xfonts-terminus \
|
||||
fonts-noto \
|
||||
fonts-wqy-microhei \
|
||||
fonts-droid-fallback \
|
||||
htop \
|
||||
@ -179,36 +171,36 @@ export DEBIAN_FRONTEND=noninteractive
|
||||
apt_get_update
|
||||
|
||||
# On older Ubuntu, Tilix is in a PPA. on Debian stretch its in backports.
|
||||
if [[ -z $(apt-cache --names-only search ^tilix$) ]]; then
|
||||
. /etc/os-release
|
||||
if [ "${ID}" = "ubuntu" ]; then
|
||||
check_packages apt-transport-https software-properties-common
|
||||
add-apt-repository -y ppa:webupd8team/terminix
|
||||
elif [ "${VERSION_CODENAME}" = "stretch" ]; then
|
||||
echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list
|
||||
fi
|
||||
apt-get update
|
||||
if [[ -z $(apt-cache --names-only search ^tilix$) ]]; then
|
||||
echo "(!) WARNING: Tilix not available on ${ID} ${VERSION_CODENAME} architecture $(uname -m). Skipping."
|
||||
else
|
||||
package_list="${package_list} tilix"
|
||||
fi
|
||||
else
|
||||
package_list="${package_list} tilix"
|
||||
fi
|
||||
# if [[ -z $(apt-cache --names-only search ^tilix$) ]]; then
|
||||
# . /etc/os-release
|
||||
# if [ "${ID}" = "ubuntu" ]; then
|
||||
# check_packages apt-transport-https software-properties-common
|
||||
# add-apt-repository -y ppa:webupd8team/terminix
|
||||
# elif [ "${VERSION_CODENAME}" = "stretch" ]; then
|
||||
# echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list
|
||||
# fi
|
||||
# apt-get update
|
||||
# if [[ -z $(apt-cache --names-only search ^tilix$) ]]; then
|
||||
# echo "(!) WARNING: Tilix not available on ${ID} ${VERSION_CODENAME} architecture $(uname -m). Skipping."
|
||||
# else
|
||||
# package_list="${package_list} tilix"
|
||||
# fi
|
||||
# else
|
||||
# package_list="${package_list} tilix"
|
||||
# fi
|
||||
|
||||
# Install X11, fluxbox and VS Code dependencies
|
||||
check_packages ${package_list}
|
||||
|
||||
# if Ubuntu-24.04, noble(numbat) found, then will install libasound2-dev instead of libasound2.
|
||||
# this change is temporary, https://packages.ubuntu.com/noble/libasound2 will switch to libasound2 once it is available for Ubuntu-24.04, noble(numbat)
|
||||
. /etc/os-release
|
||||
if [ "${ID}" = "ubuntu" ] && [ "${VERSION_CODENAME}" = "noble" ]; then
|
||||
echo "Ubuntu 24.04, Noble(Numbat) detected. Installing libasound2-dev package..."
|
||||
check_packages "libasound2-dev"
|
||||
else
|
||||
check_packages "libasound2"
|
||||
fi
|
||||
# . /etc/os-release
|
||||
# if [ "${ID}" = "ubuntu" ] && [ "${VERSION_CODENAME}" = "noble" ]; then
|
||||
# echo "Ubuntu 24.04, Noble(Numbat) detected. Installing libasound2-dev package..."
|
||||
# check_packages "libasound2-dev"
|
||||
# else
|
||||
# check_packages "libasound2"
|
||||
# fi
|
||||
|
||||
# On newer versions of Ubuntu (22.04),
|
||||
# we need an additional package that isn't provided in earlier versions
|
||||
@ -217,9 +209,9 @@ if ! type vncpasswd > /dev/null 2>&1; then
|
||||
fi
|
||||
|
||||
# Install Emoji font if available in distro - Available in Debian 10+, Ubuntu 18.04+
|
||||
if dpkg-query -W fonts-noto-color-emoji > /dev/null 2>&1 && ! dpkg -s fonts-noto-color-emoji > /dev/null 2>&1; then
|
||||
apt-get -y install --no-install-recommends fonts-noto-color-emoji
|
||||
fi
|
||||
# if dpkg-query -W fonts-noto-color-emoji > /dev/null 2>&1 && ! dpkg -s fonts-noto-color-emoji > /dev/null 2>&1; then
|
||||
# apt-get -y install --no-install-recommends fonts-noto-color-emoji
|
||||
# fi
|
||||
|
||||
# Check at least one locale exists
|
||||
if ! grep -o -E '^\s*en_US.UTF-8\s+UTF-8' /etc/locale.gen > /dev/null; then
|
||||
@ -228,13 +220,13 @@ if ! grep -o -E '^\s*en_US.UTF-8\s+UTF-8' /etc/locale.gen > /dev/null; then
|
||||
fi
|
||||
|
||||
# Install the Cascadia Code fonts - https://github.com/microsoft/cascadia-code
|
||||
if [ ! -d "/usr/share/fonts/truetype/cascadia" ]; then
|
||||
curl -sSL https://github.com/microsoft/cascadia-code/releases/download/v2008.25/CascadiaCode-2008.25.zip -o /tmp/cascadia-fonts.zip
|
||||
unzip /tmp/cascadia-fonts.zip -d /tmp/cascadia-fonts
|
||||
mkdir -p /usr/share/fonts/truetype/cascadia
|
||||
mv /tmp/cascadia-fonts/ttf/* /usr/share/fonts/truetype/cascadia/
|
||||
rm -rf /tmp/cascadia-fonts.zip /tmp/cascadia-fonts
|
||||
fi
|
||||
# if [ ! -d "/usr/share/fonts/truetype/cascadia" ]; then
|
||||
# curl -sSL https://github.com/microsoft/cascadia-code/releases/download/v2008.25/CascadiaCode-2008.25.zip -o /tmp/cascadia-fonts.zip
|
||||
# unzip /tmp/cascadia-fonts.zip -d /tmp/cascadia-fonts
|
||||
# mkdir -p /usr/share/fonts/truetype/cascadia
|
||||
# mv /tmp/cascadia-fonts/ttf/* /usr/share/fonts/truetype/cascadia/
|
||||
# rm -rf /tmp/cascadia-fonts.zip /tmp/cascadia-fonts
|
||||
# fi
|
||||
|
||||
# Install noVNC
|
||||
if [ "${INSTALL_NOVNC}" = "true" ] && [ ! -d "/usr/local/novnc" ]; then
|
||||
|
||||
57
poetry.lock
generated
57
poetry.lock
generated
@ -31,19 +31,6 @@ doc = ["Sphinx (>=7)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphin
|
||||
test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"]
|
||||
trio = ["trio (>=0.23)"]
|
||||
|
||||
[[package]]
|
||||
name = "asyncio"
|
||||
version = "3.4.3"
|
||||
description = "reference implementation of PEP 3156"
|
||||
optional = false
|
||||
python-versions = "*"
|
||||
files = [
|
||||
{file = "asyncio-3.4.3-cp33-none-win32.whl", hash = "sha256:b62c9157d36187eca799c378e572c969f0da87cd5fc42ca372d92cdb06e7e1de"},
|
||||
{file = "asyncio-3.4.3-cp33-none-win_amd64.whl", hash = "sha256:c46a87b48213d7464f22d9a497b9eef8c1928b68320a2fa94240f969f6fec08c"},
|
||||
{file = "asyncio-3.4.3-py3-none-any.whl", hash = "sha256:c4d18b22701821de07bd6aea8b53d21449ec0ec5680645e5317062ea21817d2d"},
|
||||
{file = "asyncio-3.4.3.tar.gz", hash = "sha256:83360ff8bc97980e4ff25c964c7bd3923d333d177aa4f7fb736b019f26c7cb41"},
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "certifi"
|
||||
version = "2024.7.4"
|
||||
@ -179,23 +166,6 @@ files = [
|
||||
{file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "coloredlogs"
|
||||
version = "15.0.1"
|
||||
description = "Colored terminal output for Python's logging module"
|
||||
optional = false
|
||||
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
|
||||
files = [
|
||||
{file = "coloredlogs-15.0.1-py2.py3-none-any.whl", hash = "sha256:612ee75c546f53e92e70049c9dbfcc18c935a2b9a53b66085ce9ef6a6e5c0934"},
|
||||
{file = "coloredlogs-15.0.1.tar.gz", hash = "sha256:7c991aa71a4577af2f82600d8f8f3a89f936baeaf9b50a9c197da014e5bf16b0"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
humanfriendly = ">=9.1"
|
||||
|
||||
[package.extras]
|
||||
cron = ["capturer (>=2.4)"]
|
||||
|
||||
[[package]]
|
||||
name = "deprecated"
|
||||
version = "1.2.14"
|
||||
@ -394,20 +364,6 @@ cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
|
||||
http2 = ["h2 (>=3,<5)"]
|
||||
socks = ["socksio (==1.*)"]
|
||||
|
||||
[[package]]
|
||||
name = "humanfriendly"
|
||||
version = "10.0"
|
||||
description = "Human friendly output for text interfaces using Python"
|
||||
optional = false
|
||||
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
|
||||
files = [
|
||||
{file = "humanfriendly-10.0-py2.py3-none-any.whl", hash = "sha256:1697e1a8a8f550fd43c2865cd84542fc175a61dcb779b6fee18cf6b6ccba1477"},
|
||||
{file = "humanfriendly-10.0.tar.gz", hash = "sha256:6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
pyreadline3 = {version = "*", markers = "sys_platform == \"win32\" and python_version >= \"3.8\""}
|
||||
|
||||
[[package]]
|
||||
name = "idna"
|
||||
version = "3.7"
|
||||
@ -851,17 +807,6 @@ files = [
|
||||
[package.extras]
|
||||
windows-terminal = ["colorama (>=0.4.6)"]
|
||||
|
||||
[[package]]
|
||||
name = "pyreadline3"
|
||||
version = "3.4.1"
|
||||
description = "A python implementation of GNU readline."
|
||||
optional = false
|
||||
python-versions = "*"
|
||||
files = [
|
||||
{file = "pyreadline3-3.4.1-py3-none-any.whl", hash = "sha256:b0efb6516fd4fb07b45949053826a62fa4cb353db5be2bbb4a7aa1fdd1e345fb"},
|
||||
{file = "pyreadline3-3.4.1.tar.gz", hash = "sha256:6f3d1f7b8a31ba32b73917cefc1f28cc660562f39aea8646d30bd6eff21f7bae"},
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pytest"
|
||||
version = "8.3.1"
|
||||
@ -1412,4 +1357,4 @@ files = [
|
||||
[metadata]
|
||||
lock-version = "2.0"
|
||||
python-versions = "^3.11"
|
||||
content-hash = "a2d562e14464e095ab9ce66bb9fef77291274e1316397e76e25aeb542b39a3af"
|
||||
content-hash = "8006214536029aa31b541a1eeff10bdb99542c9dc0e854e5d59e97cab4d68f49"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user