diff --git a/config-odoo/Dockerfile b/config-odoo/Dockerfile deleted file mode 100644 index 41963ff..0000000 --- a/config-odoo/Dockerfile +++ /dev/null @@ -1,109 +0,0 @@ -FROM ubuntu:noble -MAINTAINER Odoo S.A. - -SHELL ["/bin/bash", "-xo", "pipefail", "-c"] - -# Generate locale C.UTF-8 for postgres and general locale data -ENV LANG en_US.UTF-8 - -# Retrieve the target architecture to install the correct wkhtmltopdf package -ARG TARGETARCH - -# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - dirmngr \ - fonts-noto-cjk \ - gnupg \ - libssl-dev \ - node-less \ - npm \ - vim \ - python3-magic \ - python3-num2words \ - python3-odf \ - python3-pdfminer \ - python3-pip \ - python3-phonenumbers \ - python3-pyldap \ - python3-qrcode \ - python3-renderpm \ - python3-setuptools \ - python3-slugify \ - python3-vobject \ - python3-watchdog \ - python3-xlrd \ - python3-xlwt \ - xz-utils && \ - if [ -z "${TARGETARCH}" ]; then \ - TARGETARCH="$(dpkg --print-architecture)"; \ - fi; \ - WKHTMLTOPDF_ARCH=${TARGETARCH} && \ - case ${TARGETARCH} in \ - "amd64") WKHTMLTOPDF_ARCH=amd64 && WKHTMLTOPDF_SHA=967390a759707337b46d1c02452e2bb6b2dc6d59 ;; \ - "arm64") WKHTMLTOPDF_SHA=90f6e69896d51ef77339d3f3a20f8582bdf496cc ;; \ - "ppc64le" | "ppc64el") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=5312d7d34a25b321282929df82e3574319aed25c ;; \ - esac \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.jammy_${WKHTMLTOPDF_ARCH}.deb \ - && echo ${WKHTMLTOPDF_SHA} wkhtmltox.deb | sha1sum -c - \ - && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb - -# install latest postgresql-client -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ - && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && apt-get update \ - && apt-get install --no-install-recommends -y postgresql-client \ - && rm -f /etc/apt/sources.list.d/pgdg.list \ - && rm -rf /var/lib/apt/lists/* - -# Install rtlcss (on Debian buster) -RUN npm install -g rtlcss - -# Install Odoo -ENV ODOO_VERSION 18.0 -ARG ODOO_RELEASE=20260324 -ARG ODOO_SHA=ae28e50ed972a6e57f7de42fc3b267acd4ab1f33 -RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \ - && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ - && apt-get update \ - && apt-get -y install --no-install-recommends ./odoo.deb \ - && rm -rf /var/lib/apt/lists/* odoo.deb - -# Install Python dependencies for OCA modules -COPY ./requirements.txt /tmp/requirements.txt -RUN pip install --no-cache-dir --break-system-packages -r /tmp/requirements.txt - -# Copy entrypoint script and Odoo configuration file -COPY ./entrypoint.sh / -COPY ./odoo.conf /etc/odoo/ - -# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons -RUN chown odoo /etc/odoo/odoo.conf \ - && mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons -VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] - -# Expose Odoo services -EXPOSE 8069 8071 8072 - -# Set the default config file -ENV ODOO_RC /etc/odoo/odoo.conf - -COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py - -# Set default user when running the container -USER odoo - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["odoo"] diff --git a/config-odoo/download.odoo.Dockerfile.sh b/config-odoo/download.odoo.Dockerfile.sh deleted file mode 100644 index c078800..0000000 --- a/config-odoo/download.odoo.Dockerfile.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - - -# recupérer le commit sur l'url -# par exemple : -# URL : https://github.com/odoo/docker/tree/b8b9102bf64e67d7baeaa410ff506dbe16fa8dfe/18.0 -# Commit ! b8b9102bf64e67d7baeaa410ff506dbe16fa8dfe -# - -COMMIT="b8b9102bf64e67d7baeaa410ff506dbe16fa8dfe" -BASE="https://raw.githubusercontent.com/odoo/docker/${COMMIT}/18.0" -DEST="./" -FILES=(Dockerfile entrypoint.sh odoo.conf wait-for-psql.py) - -mkdir -p "${DEST}" -for f in "${FILES[@]}"; do - curl -fsSL "${BASE}/${f}" -o "${DEST}/${f}" -done -chmod +x "${DEST}/entrypoint.sh" "${DEST}/wait-for-psql.py" - -sed -i 's/curl \\/curl vim \\/' "${DEST}/Dockerfile" -sed -i 's|^COPY \./entrypoint\.sh /$|COPY ./requirements.txt /tmp/requirements.txt\nRUN pip install --no-cache-dir --break-system-packages -r /tmp/requirements.txt\nCOPY ./entrypoint.sh /|' "${DEST}/Dockerfile" - -echo "OK. ${#FILES[@]} fichiers dans ${DEST}" diff --git a/config-odoo/entrypoint.sh b/config-odoo/entrypoint.sh deleted file mode 100755 index f802bcb..0000000 --- a/config-odoo/entrypoint.sh +++ /dev/null @@ -1,49 +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 - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - fi - ;; - -*) - wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" - ;; - *) - exec "$@" -esac - -exit 1 diff --git a/config-odoo/requirements.txt b/config-odoo/requirements.txt deleted file mode 100644 index 8a1b6ef..0000000 --- a/config-odoo/requirements.txt +++ /dev/null @@ -1,15 +0,0 @@ -packaging -regex -dateparser -pymupdf -factur-x -lxml -num2words -pyfrdas2>=0.10 -pypdf>=3.1.0 -python-dateutil -python-stdnum -requests -requests_oauthlib -unidecode - diff --git a/config-odoo/wait-for-psql.py b/config-odoo/wait-for-psql.py deleted file mode 100755 index a55f440..0000000 --- a/config-odoo/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) diff --git a/config-postgresql/Dockerfile b/config-postgresql/Dockerfile deleted file mode 100644 index 83e4eaf..0000000 --- a/config-postgresql/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -# Utiliser l'image officielle PostgreSQL 15 -FROM postgres:15 - -# Changer le port d'écoute dans la configuration PostgreSQL -RUN sed -i 's/^#port = 5432/port = 5434/' /usr/share/postgresql/postgresql.conf.sample - -# Copier la configuration dans le répertoire de configuration PostgreSQL -CMD ["postgres", "-c", "config_file=/usr/share/postgresql/postgresql.conf.sample"] - -