diff --git a/.gitmodules b/.gitmodules index db4bce0..eaa6318 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,46 +1,50 @@ [submodule "modules/party_co"] path = modules/party_co - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-party_co.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-party_co.git branch = main [submodule "web_app"] path = web_app - url = ssh://git@gitea.onecluster.org:6666/OneTeam/Naliia_webapp.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/Naliia_webapp.git branch = main -[submodule "naliia"] +[submodule "modules/naliia"] path = modules/naliia - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytond-au-naliia.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytond-au-naliia.git [submodule "modules/sale_w_tax"] path = modules/sale_w_tax - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_w_tax.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_w_tax.git branch = 7.6 [submodule "modules/sale_shop"] path = modules/sale_shop - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_shop.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_shop.git branch = 7.6 [submodule "modules/sale_pos"] path = modules/sale_pos - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_pos.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_pos.git branch = 7.6 [submodule "modules/sale_payment"] path = modules/sale_payment - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_payment.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_payment.git branch = 7.6 [submodule "modules/sale_pos_extras"] path = modules/sale_pos_extras - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_pos_extras.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_pos_extras.git branch = 7.6 [submodule "modules/sale_one_click"] path = modules/sale_one_click - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_one_click.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_one_click.git branch = 7.6 [submodule "modules/purchase_one_click"] path = modules/purchase_one_click - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-purchase_one_click.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-purchase_one_click.git branch = 7.6 [submodule "modules/naliia_shop"] path = modules/naliia_shop - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytond-au-naliia_shop.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytond-au-naliia_shop.git [submodule "modules/naliia_payment"] path = modules/naliia_payment - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytond-au-naliia_payment.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytond-au-naliia_payment.git branch = main +[submodule "modules/account_co_pyme"] + path = modules/account_co_pyme + url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-account_co_pyme.git + branch = 7.6 diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..bd09adc --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,33 @@ +services: + db: + image: postgres:12 + environment: + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_DB=${POSTGRES_DB} + live: + build: + context: . + dockerfile: Dockerfile_Live + args: + TRYTOND_VERSION: ${TRYTOND_VERSION} + depends_on: + - db + command: bash /app/.dev/run.sh + environment: + - DB_NAME=${POSTGRES_DB} + - SRC=/app + - TRYTOND_DATABASE_URI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOSTNAME}:5432/ + volumes: + - ./:/app + - ./attachments:/attachments + - ./.dev/pudb.cfg:/root/.config/pudb/pudb.cfg + ports: + - "${TRYTOND_PORT_LIVE:-18020}:8000" + - "${PUDB_PORT_LIVE:-8020}:8020" + working_dir: /app + env_file: + - .env +volumes: + app: + attachments: diff --git a/modules/account_co_pyme b/modules/account_co_pyme new file mode 160000 index 0000000..e49d942 --- /dev/null +++ b/modules/account_co_pyme @@ -0,0 +1 @@ +Subproject commit e49d942e466dac6b7b3adf406da43bd82898e50c