diff --git a/gnuhealth.sh b/gnuhealth.sh index a781b23..ac0543c 100755 --- a/gnuhealth.sh +++ b/gnuhealth.sh @@ -25,7 +25,7 @@ envsubst <${SOURCE_DIR}/srv/gnuhealth/conf/trytond.conf >/srv/gnuhealth/conf/try export GNUHEALTH_ADMIN_USER="admin" 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.13/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.14/bin/trytond-admin -d gnuhealth --all -v rm -f /tmp/.adminpwd spotter-appmgr update-login gnuhealth "${GNUHEALTH_ADMIN_USER}" "${GNUHEALTH_ADMIN_PWD}" diff --git a/gnuhealth/Dockerfile b/gnuhealth/Dockerfile index b6ad88a..92e8758 100644 --- a/gnuhealth/Dockerfile +++ b/gnuhealth/Dockerfile @@ -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.13/trytond/backend/postgresql/database.py \ + && sed -i 's/template1/gnuhealth/g' /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.14/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.13/bin:${PATH} \ +ENV PATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.14/bin:${PATH} \ TRYTOND_CONFIG=/srv/gnuhealth/gnuhealth/tryton/server/config/trytond.conf \ - PYTHONPATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.13:/srv/gnuhealth/gnuhealth/tryton/server/config + PYTHONPATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.14:/srv/gnuhealth/gnuhealth/tryton/server/config CMD ["trytond", "--verbose"]