Spotter-Cluster/Spotter-VM
2
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Bump GNU Health Tryton version to 4.2.13

Browse Source
This commit is contained in:
Disassembler 2018-07-09 21:00:21 +02:00
parent 522f9a7345
commit 7d62e9e0fa
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnuhealth.sh
View File

@ -24,7 +24,7 @@ envsubst <${SOURCE_DIR}/srv/gnuhealth/conf/trytond.conf >/srv/gnuhealth/conf/try
export GNUHEALTH_ADMIN_USER="admin" export GNUHEALTH_ADMIN_USER="admin"
export GNUHEALTH_ADMIN_PWD=$(head -c 12 /dev/urandom | base64) export GNUHEALTH_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
echo ${GNUHEALTH_ADMIN_PWD} >/tmp/.adminpwd 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.10/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.13/bin/trytond-admin -d gnuhealth --all -v
rm -f /tmp/.adminpwd rm -f /tmp/.adminpwd
spotter-appmgr update-login gnuhealth "${GNUHEALTH_ADMIN_USER}" "${GNUHEALTH_ADMIN_PWD}" spotter-appmgr update-login gnuhealth "${GNUHEALTH_ADMIN_USER}" "${GNUHEALTH_ADMIN_PWD}"

6
gnuhealth/Dockerfile
View File

@ -27,7 +27,7 @@ RUN \
&& cd /srv/gnuhealth \ && cd /srv/gnuhealth \
&& sudo -u gnuhealth ./gnuhealth-setup install \ && sudo -u gnuhealth ./gnuhealth-setup install \
# Hackfix template1 database lock # Hackfix template1 database lock
&& sed -i 's/template1/gnuhealth/g' /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.10/trytond/backend/postgresql/database.py \ && sed -i 's/template1/gnuhealth/g' /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.13/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 \
&& sudo -u gnuhealth npm install grunt grunt-cli grunt-contrib-concat grunt-contrib-jshint grunt-contrib-uglify grunt-contrib-less grunt-po2json \ && 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 EXPOSE 8080
USER gnuhealth USER gnuhealth
ENV PATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.10/bin:${PATH} \ ENV PATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.13/bin:${PATH} \
TRYTOND_CONFIG=/srv/gnuhealth/gnuhealth/tryton/server/config/trytond.conf \ TRYTOND_CONFIG=/srv/gnuhealth/gnuhealth/tryton/server/config/trytond.conf \
PYTHONPATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.10:/srv/gnuhealth/gnuhealth/tryton/server/config PYTHONPATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.13:/srv/gnuhealth/gnuhealth/tryton/server/config
CMD ["trytond", "--verbose"] CMD ["trytond", "--verbose"]