changeset 15604b634014 in tryton-docker:default details: https://hg.tryton.org/tryton-docker?cmd=changeset&node=15604b634014 description: Add 6.6 series diffstat:
6.6/Dockerfile | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ 6.6/entrypoint.sh | 18 +++++++++ 6.6/office/Dockerfile | 15 ++++++++ 6.6/trytond.conf | 3 + 6.6/uwsgi.conf | 9 ++++ update.sh | 9 +++- 6 files changed, 145 insertions(+), 2 deletions(-) diffs (190 lines): diff -r 921e91f91a6e -r 15604b634014 6.6/Dockerfile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/6.6/Dockerfile Mon Oct 31 19:15:40 2022 +0100 @@ -0,0 +1,93 @@ +FROM node as builder-node +ENV SERIES 6.6 +RUN npm install -g bower +RUN curl https://downloads.tryton.org/${SERIES}/tryton-sao-last.tgz | tar zxf - -C / +RUN cd /package && bower install --allow-root + +FROM debian:11-slim +LABEL maintainer="Tryton <foundat...@tryton.org>" \ + org.label-schema.name="Tryton" \ + org.label-schema.url="http://www.tryton.org/"; \ + org.label-schema.vendor="Tryton" \ + org.label-schema.version="6.6" \ + org.label-schema.schema-version="1.0" + +ENV SERIES 6.6 +ENV LANG C.UTF-8 + +RUN groupadd -r trytond \ + && useradd --no-log-init -r -d /var/lib/trytond -m -g trytond trytond \ + && mkdir /var/lib/trytond/db && chown trytond:trytond /var/lib/trytond/db \ + && mkdir /var/lib/trytond/www \ + && mkdir -p /etc/python3 \ + && echo "[DEFAULT]\nbyte-compile = standard, optimize" \ + > /etc/python3/debian_config + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + python3 \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + uwsgi \ + uwsgi-plugin-python3 \ + python3-argcomplete \ + # trytond + python3-bcrypt \ + python3-cffi \ + python3-genshi \ + python3-gevent \ + python3-html2text \ + python3-pil \ + python3-levenshtein \ + python3-lxml \ + python3-passlib \ + python3-polib \ + python3-psycopg2 \ + python3-pydot \ + python3-werkzeug \ + python3-wrapt \ + # modules + python3-dateutil \ + python3-ldap3 \ + python3-magic \ + python3-ofxparse \ + python3-pypdf2 \ + python3-pysimplesoap \ + python3-requests \ + python3-simpleeval \ + python3-tz \ + python3-yaml \ + python3-zeep \ + weasyprint \ + libpango-1.0-0 \ + libpangoft2-1.0-0 \ + && rm -rf /var/lib/apt/lists/* + +RUN pip3 install --no-cache-dir \ + "trytond == ${SERIES}.*" \ + "proteus == ${SERIES}.*" \ + && for module in `curl https://downloads.tryton.org/${SERIES}/modules.txt`; do \ + pip3 install --no-cache-dir "trytond_${module} == ${SERIES}.*" || exit 1; \ + done \ + && pip3 install --no-cache-dir \ + phonenumbers \ + pycountry \ + pygal \ + python-stdnum[SOAP] \ + schwifty \ + && python3 -c "import compileall; compileall.compile_path(maxlevels=10, optimize=1)" + +COPY --from=builder-node /package /var/lib/trytond/www +COPY entrypoint.sh / +COPY trytond.conf /etc/trytond.conf +COPY uwsgi.conf /etc/uwsgi.conf + +EXPOSE 8000 + +VOLUME ["/var/lib/trytond/db"] +ENV TRYTOND_CONFIG=/etc/trytond.conf +USER trytond +ENTRYPOINT ["/entrypoint.sh"] +CMD ["uwsgi", "--ini", "/etc/uwsgi.conf"] diff -r 921e91f91a6e -r 15604b634014 6.6/entrypoint.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/6.6/entrypoint.sh Mon Oct 31 19:15:40 2022 +0100 @@ -0,0 +1,18 @@ +#!/bin/bash + +set -e + +: ${DB_USER:=${POSTGRES_ENV_POSTGRES_USER:='postgres'}} +: ${DB_PASSWORD:=${POSTGRES_ENV_POSTGRES_PASSWORD}} +: ${DB_HOSTNAME:=${POSTGRES_PORT_5432_TCP_ADDR:='postgres'}} +: ${DB_PORT:=${POSTGRES_PORT_5432_TCP_PORT:='5432'}} +: ${TRYTOND_DATABASE_URI:="postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/"} +: ${PYTHONOPTIMIZE:=1} + +export TRYTOND_DATABASE_URI PYTHONOPTIMIZE + +if [ "${1:0:1}" = '-' ]; then + set -- uwsgi --ini /etc/uwsgi.conf "$@" +fi + +exec "$@" diff -r 921e91f91a6e -r 15604b634014 6.6/office/Dockerfile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/6.6/office/Dockerfile Mon Oct 31 19:15:40 2022 +0100 @@ -0,0 +1,15 @@ +FROM tryton/tryton:6.6 +LABEL org.label-schema.version="6.6-office" + +USER root + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + libreoffice-calc \ + libreoffice-draw \ + libreoffice-impress \ + libreoffice-writer \ + fonts-liberation2 \ + && rm -rf /var/lib/apt/lists/* + +USER trytond diff -r 921e91f91a6e -r 15604b634014 6.6/trytond.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/6.6/trytond.conf Mon Oct 31 19:15:40 2022 +0100 @@ -0,0 +1,3 @@ +[web] +listen=0.0.0.0:8000 +root=/var/lib/trytond/www diff -r 921e91f91a6e -r 15604b634014 6.6/uwsgi.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/6.6/uwsgi.conf Mon Oct 31 19:15:40 2022 +0100 @@ -0,0 +1,9 @@ +[uwsgi] +http-socket=0.0.0.0:8000 +plugins=python3 +env=TRYTOND_CONFIG=$(TRYTOND_CONFIG) +env=TRYTOND_DATABASE_URI=$(TRYTOND_DATABASE_URI) +env=PYTHONOPTIMIZE=$(PYTHONOPTIMIZE) +wsgi=trytond.application:app +processes=1 +threads=4 diff -r 921e91f91a6e -r 15604b634014 update.sh --- a/update.sh Mon May 02 23:03:13 2022 +0200 +++ b/update.sh Mon Oct 31 19:15:40 2022 +0100 @@ -1,8 +1,10 @@ #!/bin/sh set -e -docker build -q --rm --no-cache -t tryton/tryton:6.4 -t tryton/tryton:latest 6.4 -docker build -q --rm --no-cache -t tryton/tryton:6.4-office -t tryton/tryton:office 6.4/office +docker build -q --rm --no-cache -t tryton/tryton:6.6 -t tryton/tryton:latest 6.6 +docker build -q --rm --no-cache -t tryton/tryton:6.6-office -t tryton/tryton:office 6.6/office +docker build -q --rm --no-cache -t tryton/tryton:6.4 6.4 +docker build -q --rm --no-cache -t tryton/tryton:6.4-office 6.4/office docker build -q --rm --no-cache -t tryton/tryton:6.2 6.2 docker build -q --rm --no-cache -t tryton/tryton:6.2-office 6.2/office docker build -q --rm --no-cache -t tryton/tryton:6.0 6.0 @@ -10,6 +12,7 @@ docker build -q --rm --no-cache -t tryton/tryton:5.0 5.0 docker build -q --rm --no-cache -t tryton/tryton:5.0-office 5.0/office +docker run --rm --env DB_CACHE=/tmp --env TRYTOND_DATABASE_URI=sqlite:// tryton/tryton:6.6 python3 -m unittest discover -s trytond docker run --rm --env DB_CACHE=/tmp --env TRYTOND_DATABASE_URI=sqlite:// tryton/tryton:6.4 python3 -m unittest discover -s trytond docker run --rm --env DB_CACHE=/tmp --env TRYTOND_DATABASE_URI=sqlite:// tryton/tryton:6.2 python3 -m trytond.tests.run-tests -m docker run --rm --env DB_CACHE=/tmp --env TRYTOND_DATABASE_URI=sqlite:// tryton/tryton:6.0 python3 -m trytond.tests.run-tests -m @@ -23,5 +26,7 @@ docker push tryton/tryton:6.2 docker push tryton/tryton:6.4-office docker push tryton/tryton:6.4 +docker push tryton/tryton:6.6-office +docker push tryton/tryton:6.6 docker push tryton/tryton:office docker push tryton/tryton:latest
