From 258ece68f58e688a42fb1823c8f3485a4629cf44 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sun, 25 Mar 2018 22:36:44 +0200
Subject: [PATCH] Bump GNU Health Tryton version to 4.2.10

---
 gnuhealth.sh         | 2 +-
 gnuhealth/Dockerfile | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnuhealth.sh b/gnuhealth.sh
index d9f0c8d..ba5f198 100755
--- a/gnuhealth.sh
+++ b/gnuhealth.sh
@@ -20,7 +20,7 @@ envsubst <${SOURCE_DIR}/srv/gnuhealth/conf/trytond.conf >/srv/gnuhealth/conf/try
 # Populate database
 export GNUHEALTH_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 echo ${GNUHEALTH_ADMIN_PWD} >/tmp/.adminpwd
-docker run --rm -h gnuhealth --link postgres -v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config -v /tmp/.adminpwd:/tmp/.adminpwd -e TRYTONPASSFILE=/tmp/.adminpwd gnuhealth /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.9/bin/trytond-admin -d gnuhealth --all -v
+docker run --rm -h gnuhealth --link postgres -v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config -v /tmp/.adminpwd:/tmp/.adminpwd -e TRYTONPASSFILE=/tmp/.adminpwd gnuhealth /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.10/bin/trytond-admin -d gnuhealth --all -v
 rm -f /tmp/.adminpwd
 
 # Populate demo database
diff --git a/gnuhealth/Dockerfile b/gnuhealth/Dockerfile
index f370949..dbd8786 100644
--- a/gnuhealth/Dockerfile
+++ b/gnuhealth/Dockerfile
@@ -40,7 +40,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.9/trytond/backend/postgresql/database.py \
+ && sed -i 's/template1/gnuhealth/g' /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.10/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 \
@@ -55,7 +55,7 @@ VOLUME ["/srv/gnuhealth/gnuhealth/tryton/server/config"]
 EXPOSE 8008
 
 USER gnuhealth
-ENV PATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.9/bin:${PATH} \
+ENV PATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.10/bin:${PATH} \
     TRYTOND_CONFIG=/srv/gnuhealth/gnuhealth/tryton/server/config/trytond.conf \
-    PYTHONPATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.9:/srv/gnuhealth/gnuhealth/tryton/server/config
+    PYTHONPATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.10:/srv/gnuhealth/gnuhealth/tryton/server/config
 CMD ["trytond", "--verbose"]