forked from 0x2620/pandora
use focal oxframe builds for bullseye
This commit is contained in:
parent
7216e255de
commit
42bfbb0808
3 changed files with 14 additions and 3 deletions
|
@ -1,4 +1,4 @@
|
|||
FROM debian:buster
|
||||
FROM debian:bullseye
|
||||
|
||||
LABEL maintainer="0x2620@0x2620.org"
|
||||
|
||||
|
|
|
@ -1,9 +1,14 @@
|
|||
#!/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
|
||||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/99languages
|
||||
|
|
|
@ -28,6 +28,9 @@ fi
|
|||
if [ -z "$UBUNTU_CODENAME" ]; then
|
||||
UBUNTU_CODENAME=bionic
|
||||
fi
|
||||
if [ "$VERSION_CODENAME" = "bullseye" ]; then
|
||||
UBUNTU_CODENAME=focal
|
||||
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
|
||||
|
||||
|
@ -106,12 +109,13 @@ 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 \
|
||||
|
@ -123,8 +127,10 @@ 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
|
||||
|
|
Loading…
Reference in a new issue