Bump GNU Health to 3.2.10 and Tryton to 4.2.15

This commit is contained in:
Disassembler 2018-08-30 18:35:05 +02:00
parent a6ab5edc02
commit 36c5ebbd78
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499

View File

@ -13,9 +13,9 @@ RUN \
# Install build dependencies
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
&& wget http://ftp.gnu.org/gnu/health/gnuhealth-3.2.8.tar.gz -O /tmp/gnuhealth.tgz \
&& wget http://ftp.gnu.org/gnu/health/gnuhealth-3.2.10.tar.gz -O /tmp/gnuhealth.tgz \
&& tar xzf /tmp/gnuhealth.tgz -C /srv \
&& mv /srv/gnuhealth-3.2.8 /srv/gnuhealth \
&& mv /srv/gnuhealth-3.2.10 /srv/gnuhealth \
&& rm -f /tmp/gnuhealth.tgz \
# Clone Sao (Tryton web client) repository
&& git clone -b 4.2 --single-branch --depth 1 https://github.com/tryton/sao /srv/gnuhealth/sao \
@ -27,7 +27,7 @@ RUN \
&& cd /srv/gnuhealth \
&& sudo -u gnuhealth ./gnuhealth-setup install \
# Hackfix template1 database lock
&& sed -i 's/template1/gnuhealth/g' /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.14/trytond/backend/postgresql/database.py \
&& sed -i 's/template1/gnuhealth/g' /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.15/trytond/backend/postgresql/database.py \
# Install Sao (Tryton web client) dependencies
&& cd /srv/gnuhealth/sao \
&& sudo -u gnuhealth npm install grunt grunt-cli grunt-contrib-concat grunt-contrib-jshint grunt-contrib-uglify grunt-contrib-less grunt-po2json \
@ -42,7 +42,7 @@ VOLUME ["/srv/gnuhealth/gnuhealth/tryton/server/config"]
EXPOSE 8080
USER gnuhealth
ENV PATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.14/bin:${PATH} \
ENV PATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.15/bin:${PATH} \
TRYTOND_CONFIG=/srv/gnuhealth/gnuhealth/tryton/server/config/trytond.conf \
PYTHONPATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.14:/srv/gnuhealth/gnuhealth/tryton/server/config
PYTHONPATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.15:/srv/gnuhealth/gnuhealth/tryton/server/config
CMD ["trytond", "--verbose"]