diff --git a/README.md b/README.md index bf0b41b1..7801e180 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ We recommend to run pan.do/ra inside of LXD or LXC or dedicated VM or server. You will need at least 2GB of free disk space - pan.do/ra is known to work with Debian/11 (bullseye) and Ubuntu 20.04, + pan.do/ra is known to work with Ubuntu 18.04, 20.04 and Debian/10 (buster), other distributions might also work, let us know if it works for you. Use the following commands as root to install pan.do/ra and all dependencies: diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 32c536ae..727891e8 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM debian:buster LABEL maintainer="0x2620@0x2620.org" diff --git a/docker/base/install.sh b/docker/base/install.sh index 9ca3ac66..2d016eba 100755 --- a/docker/base/install.sh +++ b/docker/base/install.sh @@ -1,17 +1,9 @@ #!/bin/bash +UBUNTU_CODENAME=bionic if [ -e /etc/os-release ]; then . /etc/os-release fi -if [ -z "$UBUNTU_CODENAME" ]; then - UBUNTU_CODENAME=bionic -fi -if [ "$VERSION_CODENAME" = "bullseye" ]; then - UBUNTU_CODENAME=focal -fi -if [ "$VERSION_CODENAME" = "bookworm" ]; then - UBUNTU_CODENAME=lunar -fi export DEBIAN_FRONTEND=noninteractive echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/99languages diff --git a/vm/LXC_README.md b/vm/LXC_README.md index edc5110c..440d412a 100644 --- a/vm/LXC_README.md +++ b/vm/LXC_README.md @@ -19,7 +19,7 @@ or - sudo lxc-create -n pandora -t debian -- -r bullseye + sudo lxc-create -n pandora -t debian -- -r buster 3) Install pan.do/ra in container: diff --git a/vm/pandora_install.sh b/vm/pandora_install.sh index a98504d3..98ddc1ba 100755 --- a/vm/pandora_install.sh +++ b/vm/pandora_install.sh @@ -28,12 +28,6 @@ fi if [ -z "$UBUNTU_CODENAME" ]; then UBUNTU_CODENAME=bionic fi -if [ "$VERSION_CODENAME" = "bullseye" ]; then - UBUNTU_CODENAME=focal -fi -if [ "$VERSION_CODENAME" = "bookworm" ]; then - UBUNTU_CODENAME=lunar -fi export DEBIAN_FRONTEND=noninteractive echo "deb http://ppa.launchpad.net/j/pandora/ubuntu ${UBUNTU_CODENAME} main" > /etc/apt/sources.list.d/j-pandora.list @@ -112,13 +106,12 @@ apt-get install -y \ python3-psycopg2 \ python3-pyinotify \ python3-simplejson \ - python3-maxminddb \ - libmaxminddb-dev \ python3-lxml \ python3-cssselect \ python3-html5lib \ python3-ox \ python3-elasticsearch \ + oxframe \ ffmpeg \ mkvtoolnix \ gpac \ @@ -130,10 +123,8 @@ apt-get install -y \ postfix \ postgresql-client $EXTRA -apt-get install -y oxframe apt-get install -y --no-install-recommends youtube-dl rtmpdump - # setup database if [ "$POSTGRES" == "local" ]; then