pangea
/
django-orchestra
7
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Added preliminar support for Docker containers

This commit is contained in:
Marc Aymerich 2015-09-30 16:30:55 +00:00
parent 5f17267ff7
commit 6ef3212007
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
orchestra/bin/orchestra-admin
View File

@ -111,7 +111,6 @@ function install_requirements () {
ORCHESTRA_PATH=$(get_orchestra_dir) || true ORCHESTRA_PATH=$(get_orchestra_dir) || true
# lxml: libxml2-dev, libxslt1-dev, zlib1g-dev # lxml: libxml2-dev, libxslt1-dev, zlib1g-dev
# wkhtmltopdf: xfonts-75dpi, xvfb
APT="python3 \ APT="python3 \
python3-pip \ python3-pip \
python3-dev \ python3-dev \
@ -119,8 +118,6 @@ function install_requirements () {
libxslt1-dev \ libxslt1-dev \
zlib1g-dev \ zlib1g-dev \
bind9utils \ bind9utils \
wkhtmltopdf \
xfonts-75dpi \
xvfb \ xvfb \
ca-certificates \ ca-certificates \
gettext \ gettext \
@ -152,7 +149,7 @@ function install_requirements () {
# Install a more recent version of wkhtmltopdf (0.12.2) (PDF page number support) # Install a more recent version of wkhtmltopdf (0.12.2) (PDF page number support)
wkhtmltox=$(mktemp) wkhtmltox=$(mktemp)
wget http://download.gna.org/wkhtmltopdf/0.12/0.12.2.1/wkhtmltox-0.12.2.1_linux-jessie-amd64.deb -O ${wkhtmltox} wget http://download.gna.org/wkhtmltopdf/0.12/0.12.2.1/wkhtmltox-0.12.2.1_linux-jessie-amd64.deb -O ${wkhtmltox}
dpkg -i ${wkhtmltox} dpkg -i ${wkhtmltox} || { echo "Installing missing dependencies for wkhtmltox..." && apt-get -f install; }
# Make sure locales are in place before installing postgres # Make sure locales are in place before installing postgres
if [[ $({ perl --help > /dev/null; } 2>&1|grep 'locale failed') ]]; then if [[ $({ perl --help > /dev/null; } 2>&1|grep 'locale failed') ]]; then