chore: update Docker and build config, fix typo, update submodules

This commit is contained in:
2026-04-06 22:15:33 -05:00
parent edad4df6e4
commit 20b1f77e9e
5 changed files with 20 additions and 4 deletions

View File

@@ -11,7 +11,7 @@ if [ -z "${DEVELOP}" ]; then
fi
if [ ${DEVELOP} = "True" ]; then
pip3 install --break-system-packages proteus==${TRYTOND_VERSION}
pip3 install --break-system-packages proteus==${TRYTOND_VERSION} trytond==${TRYTOND_VERSION}
pip3 install --break-system-packages -r .dev/requirements_dev.txt
fi
@@ -19,6 +19,7 @@ fi
pip3 install --break-system-packages -r requirements.txt
pip3 install --break-system-packages trytond==${TRYTOND_VERSION}
pip install "python-sql<1.8" --break-system-packages
official_modules=".dev/official_modules.txt"
while IFS= read -r module; do

View File

@@ -19,6 +19,7 @@ source ${SCRIPT_DIR}/install_module.sh
# inicializar base de datos
# https://docs.tryton.org/projects/server/en/latest/tutorial/module/setup_database.html
yes admin | trytond-admin -d ${DB_NAME} --all --act

View File

@@ -9,11 +9,24 @@ RUN curl https://downloads.tryton.org/${SERIES}/tryton-sao-last.tgz | tar zxf -
COPY naliia_sao_custom/sao.less /package/src/sao.less
RUN cd /package && bower install --allow-root
FROM python:3.11-bullseye
FROM debian:12-slim
# trytond DB_CACHE requiere commandos `pg_dump` y `pg_restore`
RUN apt-get update && apt-get install -y postgresql-client
RUN apt-get update && apt-get install -y postgresql-client python3-pip
# TOMADO DE: https://hg.tryton.org/tryton-docker/file/tip/6.6/Dockerfile
COPY --from=builder-node /package /var/lib/trytond/www
COPY naliia_sao_custom/ /var/lib/trytond/www/
ARG TRYTONPASSFILE
ARG TRYTON_ADMIN_PASSWORD
ENV TRYTONPASSFILE=/etc/trytond_admin_pass.conf
RUN touch /etc/trytond_populate.conf \
&& touch $TRYTONPASSFILE \
&& echo $TRYTON_ADMIN_PASSWORD >> $TRYTONPASSFILE \

View File

@@ -125,7 +125,7 @@ namespace :git do
end
def compose(*arg, compose: DOCKER_COMPOSE)
sh "docker-compose -f #{compose} #{arg.join(' ')}"
sh "docker compose -f #{compose} #{arg.join(' ')}"
end
def refresh_cache

View File

@@ -11,6 +11,7 @@ services:
dockerfile: Dockerfile_Live
args:
TRYTOND_VERSION: ${TRYTOND_VERSION}
TRYTON_ADMIN_PASSWORD: ${TRYTON_ADMIN_PASSWORD:-admin}
depends_on:
- db
command: bash .dev/run.sh