From fdac35c00db489d6e8c683a2ecfb790e226845e1 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Sun, 27 Sep 2020 13:03:45 +0200
Subject: [PATCH] update django, sync docker install

---
 docker/base/install.sh |  6 +++++-
 docker/publish.sh      | 12 ++++++++++++
 requirements.txt       |  2 +-
 vm/pandora_install.sh  |  1 +
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 docker/publish.sh

diff --git a/docker/base/install.sh b/docker/base/install.sh
index 5c209f070..1bfa1bda8 100755
--- a/docker/base/install.sh
+++ b/docker/base/install.sh
@@ -30,6 +30,7 @@ apt-get update -qq
 apt-get install -y \
     netcat-openbsd \
     sudo \
+    iproute2 \
     vim \
     wget \
     pwgen \
@@ -47,17 +48,20 @@ apt-get install -y \
     python3-cssselect \
     python3-html5lib \
     python3-ox \
+    python3-elasticsearch \
     oxframe \
     ffmpeg \
     mkvtoolnix \
     gpac \
     imagemagick \
     poppler-utils \
-    youtube-dl \
     ipython3 \
+    tesseract-ocr \
+    tesseract-ocr-eng \
     postfix \
     postgresql-client
 
+apt-get install -y --no-install-recommends youtube-dl rtmpdump
 apt-get clean
 
 rm -f /install.sh
diff --git a/docker/publish.sh b/docker/publish.sh
new file mode 100644
index 000000000..f4ef0193b
--- /dev/null
+++ b/docker/publish.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# push new version of pan.do/ra to docker hub
+set -e
+
+cd /tmp
+git clone https://code.0x2620.org/0x2620/pandora
+cd pandora
+./docker/build.sh
+
+docker push 0x2620/pandora-base:latest
+docker push 0x2620/pandora-nginx:latest
+docker push 0x2620/pandora:latest
diff --git a/requirements.txt b/requirements.txt
index c3abad483..f45609b4b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==3.0.6
+Django==3.0.10
 simplejson
 chardet
 celery>4.3.0
diff --git a/vm/pandora_install.sh b/vm/pandora_install.sh
index 62fac3087..75adf3d02 100755
--- a/vm/pandora_install.sh
+++ b/vm/pandora_install.sh
@@ -89,6 +89,7 @@ apt-get install -y \
     python3-pyinotify \
     python3-simplejson \
     python3-lxml \
+    python3-cssselect \
     python3-html5lib \
     python3-ox \
     python3-elasticsearch \