diff --git a/.env_oneteam b/.env_oneteam deleted file mode 100644 index b6370ba..0000000 --- a/.env_oneteam +++ /dev/null @@ -1,40 +0,0 @@ -#version Trytond server example 6.0 -TRYTOND_VERSION=6.6 -#python version that will run the docker example 3.7 or 3.9 is mandatory in case you use tryton6.2 -PYTHON_VERSION=3.9 -#if the module repository is private -GITEA_USER= -GITEA_PASSWORD= -GITEA_ACCESS_TOKEN= -#Repository Multi Migrate -REPO_MULTI_MIGRATE=OneTeam/oc-multi_migrate_to_gitea.git -#domain server gitea -GITEA_DOMAIN=git.disroot.org -URL_MULTI_MIGRATE=https://${GITEA_USER}:${GITEA_PASSWORD}@${GITEA_DOMAIN}/OneTeam/oc-multi_migrate_to_gitea.git -#By default all organizations are set to false, activate only one. -#GnuHealth, Etrivial, tryton-ar, OneTeam, OneTeam_Pos, Presik, Datalife, NaNtic, Kalenis -Provider=OneTeam -DIR_MODULES=/usr/local/lib/python${PYTHON_VERSION}/dist-packages/trytond/modules -DB_PASSWORD=SUp3r-pass*DB -POSTGRES_DB=tryton -DB_HOSTNAME=db -POSTGRES_PASSWORD=SUp3r-pass*DB -TRYTON_PORT=8000 -DEVELOP=True -WORKER=True -TRYTONPASSFILE=/etc/trytond_admin_pass.conf -#Password user admin -TRYTONADMINPASS=admin -#Email user admin -EMAIL=admin@admin.com -SLEEP_TRYTOND_ADMIN=15 -#SMTP -#This value is True or False -SMTP=False -SMTP_TYPE=smtps+ssl -SMTP_USER= -SMTP_PASSWORD= -SMTP_DOMAIN= -SMTP_PORT=465 -SMTP_FROM=NAME_FROM -SMTP_EMAIL= diff --git a/Dockerfile b/Dockerfile index c574530..a76811a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,8 @@ USER root RUN apt-get update \ && apt-get install -y --no-install-recommends \ git \ - python3-click + python3-click \ + python3-ipython RUN echo "Install modules non official" COPY trytond.conf /etc/trytond.conf @@ -54,8 +55,10 @@ COPY trytond_worker_logging.conf /etc/trytond_worker_logging.conf RUN touch /etc/trytond_populate.conf \ && touch $TRYTONPASSFILE \ && chown -R trytond:trytond /etc/trytond* \ + && rm -r /var/log/trytond \ && mkdir /var/log/trytond \ && chown -R trytond:trytond /var/log/trytond \ + && rm -r /mnt/attachment \ && mkdir /mnt/attachment \ && chown -R trytond:trytond /mnt/attachment diff --git a/docker-compose.yml b/docker-compose.yml index fa3c71f..4e29e52 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,6 +37,7 @@ services: image: tryton/${POSTGRES_DB}:${TRYTOND_VERSION} ports: - "${TRYTON_PORT:-8000}:8000" + - "8010:8010" volumes: - modules:${DIR_MODULES} - var:/var diff --git a/trytond-modules_non_official.sh b/trytond-modules_non_official.sh index a0e7a82..9345154 100644 --- a/trytond-modules_non_official.sh +++ b/trytond-modules_non_official.sh @@ -130,6 +130,7 @@ if [ "$Provider" == "OneTeam_Pos" ]; then build-essential \ python3-dev \ python3-qrcode \ + python3-ipython \ && rm -rf /var/lib/apt/lists/* \ && pip3 install --upgrade pip \ && pip3 install -r /opt/requirements_OneTeam.txt \ @@ -145,7 +146,6 @@ if [ "$Provider" == "OneTeam_Pos" ]; then inactive_modules_trytondo=( purchase_coffee sale_payment - optical_equipment ) inactive_module "trytond-" $pip "${inactive_modules_trytondo[@]}"