Bump GNU Health to 3.4.1 + Trytond 4.6.15

This commit is contained in:
Disassembler 2019-05-08 10:34:35 +02:00
parent 081c517e21
commit 959da1a423
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499

View File

@ -14,11 +14,12 @@ RUN EOF
apk --no-cache add --virtual .deps build-base git libffi-dev libjpeg-turbo-dev libxml2-dev libxslt-dev ncurses npm patch postgresql-dev python3-dev sudo apk --no-cache add --virtual .deps build-base git libffi-dev libjpeg-turbo-dev libxml2-dev libxslt-dev ncurses npm patch postgresql-dev python3-dev sudo
# Download GNU Health # Download GNU Health
wget http://ftp.gnu.org/gnu/health/gnuhealth-3.4.0.tar.gz -O /tmp/gnuhealth.tgz # To get the matching trytond version, check latest trytond-<version>.tar.gz on http://downloads.tryton.org/4.6/
wget http://ftp.gnu.org/gnu/health/gnuhealth-3.4.1.tar.gz -O /tmp/gnuhealth.tgz
tar xzf /tmp/gnuhealth.tgz -C /srv tar xzf /tmp/gnuhealth.tgz -C /srv
mv /srv/gnuhealth-3.4.0 /srv/install mv /srv/gnuhealth-3.4.1 /srv/install
# Hackfix python-barcode support (will work in 3.4.1 - see http://hg.savannah.gnu.org/hgweb/health/rev/61b7bc7b1a78) # Hackfix python-barcode support (will work in 3.4.2 - see http://hg.savannah.gnu.org/hgweb/health/rev/61b7bc7b1a78)
sed -i 's/pybarcode/python-barcode/' /srv/install/gnuhealth-setup sed -i 's/pybarcode/python-barcode/' /srv/install/gnuhealth-setup
# Clone Sao (Tryton web client) repository # Clone Sao (Tryton web client) repository
@ -37,7 +38,7 @@ RUN EOF
sed -i '/pymongo/d' /srv/gnuhealth/gnuhealth/tryton/server/modules/health_federation/health_federation.py sed -i '/pymongo/d' /srv/gnuhealth/gnuhealth/tryton/server/modules/health_federation/health_federation.py
# Hackfix template1 database lock # Hackfix template1 database lock
sed -i 's/template1/gnuhealth/g' /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.6.13/trytond/backend/postgresql/database.py sed -i 's/template1/gnuhealth/g' /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.6.15/trytond/backend/postgresql/database.py
# Install Sao (Tryton web client) dependencies # Install Sao (Tryton web client) dependencies
cd /srv/gnuhealth/sao cd /srv/gnuhealth/sao
@ -57,7 +58,7 @@ EOF
MOUNT DIR /srv/gnuhealth/conf srv/gnuhealth/gnuhealth/tryton/server/config MOUNT DIR /srv/gnuhealth/conf srv/gnuhealth/gnuhealth/tryton/server/config
USER 8008 8008 USER 8008 8008
ENV PATH /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.6.13/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV PATH /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.6.15/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV TRYTOND_CONFIG /srv/gnuhealth/gnuhealth/tryton/server/config/trytond.conf ENV TRYTOND_CONFIG /srv/gnuhealth/gnuhealth/tryton/server/config/trytond.conf
ENV PYTHONPATH /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.6.13:/srv/gnuhealth/gnuhealth/tryton/server/config ENV PYTHONPATH /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.6.15:/srv/gnuhealth/gnuhealth/tryton/server/config
CMD trytond --verbose CMD trytond --verbose