diff --git a/deployment/docker-compose.nodb.yml b/deployment/docker-compose.nodb.yml deleted file mode 100755 index 06530a825..000000000 --- a/deployment/docker-compose.nodb.yml +++ /dev/null @@ -1,20 +0,0 @@ -version: '3.8' -services: - app: - image: ${ODOO_IMAGE:-odoo}:${ODOO_TAG:-18} - container_name: ${ODOO_CONTAINER:-odoo} - ports: - - ${ODOO_PORT:-8069}:8069 - # - "${ODOO_CHAT_PORT:-8072}:8072" - tty: true - command: -- - environment: - - HOST=db - - USER=${PG_USER:-changeme} - - PASSWORD=${PG_PASS:-password} - volumes: - - ${ODOO_ADDONS:-./addons}:/mnt/extra-addons - - ${ODOO_CONFIG:-./etc}:/etc/odoo - - ${ODOO_BACKUP:-./backup}:/var/lib/odoo/backup - restart: always - diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml deleted file mode 100755 index 15ddad26d..000000000 --- a/deployment/docker-compose.yml +++ /dev/null @@ -1,35 +0,0 @@ -version: '3.8' -services: - app: - image: ${ODOO_IMAGE:-odoo}:${ODOO_TAG:-18} - container_name: ${ODOO_CONTAINER:-odoo} - # user: root - depends_on: - - db - ports: - - ${ODOO_PORT:-8069}:8069 - # - "${ODOO_CHAT_PORT:-8072}:8072" - tty: true - command: -- - environment: - - HOST=db - - USER=${PG_USER:-changeme} - - PASSWORD=${PG_PASS:-password} - volumes: - - ${ODOO_ADDONS:-./addons}:/mnt/extra-addons - - ${ODOO_CONFIG:-./etc}:/etc/odoo - - ${ODOO_BACKUP:-./backup}:/var/lib/odoo/backup - restart: always - db: - image: postgres:16 - # user: root - environment: - - POSTGRES_USER=${PG_USER:-changeme} - - POSTGRES_PASSWORD=${PG_PASS:-password} - - POSTGRES_DB=postgres - ports: - - ${PG_PORT:-5432}:5432 - restart: always - volumes: - - ${PG_DATA:-./postgresql}:/var/lib/postgresql/data - diff --git a/deployment/entrypoint.sh b/deployment/entrypoint.sh deleted file mode 100755 index 939544337..000000000 --- a/deployment/entrypoint.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -set -e - -if [ -v PASSWORD_FILE ]; then - PASSWORD="$(< $PASSWORD_FILE)" -fi - -# set the postgres database host, port, user and password according to the environment -# and pass them as arguments to the odoo process if not present in the config file -: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} -: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} -: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} -: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} - -DB_ARGS=() -function check_config() { - param="$1" - value="$2" - if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then - value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g') - fi; - DB_ARGS+=("--${param}") - DB_ARGS+=("${value}") -} -check_config "db_host" "$HOST" -check_config "db_port" "$PORT" -check_config "db_user" "$USER" -check_config "db_password" "$PASSWORD" - -case "$1" in - -- | odoo) - shift - if [[ "$1" == "scaffold" ]] ; then - exec odoo "$@" - else - # shellcheck disable=SC2068 - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - fi - ;; - -*) - # shellcheck disable=SC2068 - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - ;; - *) - exec "$@" -esac - -exit 1 \ No newline at end of file diff --git a/deployment/env.template b/deployment/env.template deleted file mode 100755 index cb38dfbf8..000000000 --- a/deployment/env.template +++ /dev/null @@ -1,15 +0,0 @@ -COMPOSE_PROJECT_NAME = -#Odoo -ODOO_IMAGE = -ODOO_TAG= -ODOO_PORT = 10017 -ODOO_CONTAINER = -# ODOO_CHAT_PORT = -ODOO_ADDONS=./addons -ODOO_CONFIG=./etc -ODOO_BACKUP=./backup -#Database -PG_PORT= -PG_USER= -PG_PASS= -ENTRYPOINT=./entrypoint.sh diff --git a/deployment/etc/odoo.conf b/deployment/etc/odoo.conf deleted file mode 100644 index ca1198737..000000000 --- a/deployment/etc/odoo.conf +++ /dev/null @@ -1,9 +0,0 @@ -[options] -addons_path = /mnt/extra-addons -data_dir = /var/lib/odoo -db_host = db -db_port = 5432 -db_user = default_repo -db_password = smartyourlife -proxy_mode = True - diff --git a/deployment/odoo.conf.template b/deployment/odoo.conf.template deleted file mode 100755 index a295cb26b..000000000 --- a/deployment/odoo.conf.template +++ /dev/null @@ -1,7 +0,0 @@ -[options] -addons_path = /mnt/extra-addons -data_dir = /var/lib/odoo -db_host = -db_port = -db_user = -db_password = \ No newline at end of file diff --git a/deployment/requirements.txt b/deployment/requirements.txt deleted file mode 100644 index 25990d4b2..000000000 --- a/deployment/requirements.txt +++ /dev/null @@ -1,21 +0,0 @@ -python-dotenv==1.0.1; python_version > '3.10' -python_docx_replace ; python_version > '3.10' -python-docx ; python_version > '3.10' -html2text ; python_version > '3.10' -docx ; python_version > '3.10' -dropbox ; python_version > '3.10' -pyncclient ; python_version > '3.10' -nextcloud-api-wrapper ; python_version > '3.10' -boto3 ; python_version > '3.10' -paramiko ; python_version > '3.10' -proxmoxer ; python_version > '3.10' -requests ; python_version > '3.10' -google_auth ; python_version > '3.10' -odoorpc ; python_version > '3.10' -openai ; python_version > '3.10' -pysftp ; python_version > '3.10' and sys_platform != 'win32' -unidecode ; python_version > '3.10' -pdfkit ; python_version > '3.10' -pdfminer.six ; python_version > '3.10' -weasyprint -beautifulsoup4 \ No newline at end of file diff --git a/deployment/wait-for-psql.py b/deployment/wait-for-psql.py deleted file mode 100755 index 799639741..000000000 --- a/deployment/wait-for-psql.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import psycopg2 -import sys -import time - - -if __name__ == '__main__': - arg_parser = argparse.ArgumentParser() - arg_parser.add_argument('--db_host', required=True) - arg_parser.add_argument('--db_port', required=True) - arg_parser.add_argument('--db_user', required=True) - arg_parser.add_argument('--db_password', required=True) - arg_parser.add_argument('--timeout', type=int, default=5) - - args = arg_parser.parse_args() - - start_time = time.time() - while (time.time() - start_time) < args.timeout: - try: - conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') - error = '' - break - except psycopg2.OperationalError as e: - error = e - else: - conn.close() - time.sleep(1) - - if error: - print("Database connection failure: %s" % error, file=sys.stderr) - sys.exit(1) \ No newline at end of file