cleanup

.env.example

@@ -22,7 +22,6 @@ USE_REDIS=false
 USE_S3=false
 USE_SENTRY=false
 USE_PGADMIN=false
-USE_PGBOUNCER=false
 
 # GitHub user and access token to clone private repositories
 GITHUB_USER=
@@ -47,11 +46,6 @@ UNACCENT=False
 LIST_DB=True
 DBFILTER=.*
 
-# PgBouncer
-POOL_MODE=transaction
-MAX_CLIENT_CONN=500
-ADMIN_USERS=postgres,odoo
-
 # Logging
 LOG_LEVEL=info
 # Additional logs
@@ -109,7 +103,7 @@ S3_VIRTUAL_HOST=s3.odoocker.test
 S3_API_PORT=9000
 S3_CONSOLE_PORT=9001
 
-AWS_HOST=http://minio:${S3_API_PORT}
+AWS_HOST=http://s3:${S3_API_PORT}
 AWS_REGION=
 AWS_ACCESS_KEY_ID=myaccesskey
 AWS_SECRET_ACCESS_KEY=mysecretkey
@@ -141,7 +135,6 @@ USE_REDIS=${USE_REDIS}
 USE_S3=${USE_S3}
 USE_SENTRY=${USE_SENTRY}
 USE_PGADMIN=${USE_PGADMIN}
-USE_PGBOUNCER=${USE_PGBOUNCER}
 
 # Which services are going to be brought up
 COMPOSE_PROFILES=${SERVICES}
@@ -151,24 +144,20 @@ ODOO_PROFILES="odoo"
 POSTGRES_PROFILES="postgres"
 NGINX_PROFILES="nginx"
 NGINX_PROXY_PROFILES="proxy"
-TRAEFIK_PROFILES="traefik"
 ACME_COMPANION_PROFILES="acme"
 KEYDB_PROFILES="keydb"
 MINIO_PROFILES="minio"
 PGADMIN_PROFILES="pgadmin"
-PGBOUNCER_PROFILES="pgbouncer"
 
 # Containers' Tags
-ODOO_TAG=17.0
+ODOO_TAG=16.0
 POSTGRES_TAG=16.1
-PGBOUNCER_TAG=latest
 KEYDB_TAG=latest
 MINIO_TAG=latest
 NGINX_TAG=1.25.3
 NGINX_PROXY_TAG=1.4.0
-TRAEFIK_TAG=2.11
-ACME_COMPANION_TAG=2.2.10
-PGADMIN_TAG=8.2
+ACME_COMPANION_TAG=2.2.9
+PGADMIN_TAG=8.1
 
 # Odoocker paths
 COMMUNITY_ADDONS=${ROOT_PATH}/addons
@@ -324,40 +313,6 @@ POSTGRES_USER=${POSTGRES_MAIN_USER}
 POSTGRES_PASSWORD=${POSTGRES_MAIN_PASSWORD}
 PGDATA=/var/lib/postgresql/data/${PROJECT_NAME}
 
-#---------------#
-#    Traefik    #
-#---------------#
-# Volumes
-ACME_JSON=/acme.json
-TRAEFIK_LOGS=/var/log/traefik
-
-# Command
-API_DASHBOARD=true
-API_INSECURE=true
-API_DEBUG=false
-ENTRYPOINTS_WEB_ADDRESS=:80
-ENTRYPOINTS_WEBSECURE_ADDRESS=:443
-TRAEFIK_LOG_LEVEL=INFO
-ACCESSLOG_FILEPATH=${TRAEFIK_LOGS}/access.log
-ACME_HTTPCHALLENGE=true
-ACME_HTTPCHALLENGE_ENTRYPOINT=web
-ACME_EMAIL=mail@example.com
-ACME_STORAGE=${ACME_JSON}
-# For prod use: https://acme-v02.api.letsencrypt.org/directory
-ACME_CASERVER=https://acme-staging-v02.api.letsencrypt.org/directory
-INSERCURE_SKIP_VERIFY=true
-
-# Labels
-TRAEFIK_ENABLE=true
-HTTP_CATCHALL_ENTRYPOINTS=web
-HTTP_CATCHALL_MIDDLEWARES=redirect-to-https
-MIDDLEWARES_REDIRECT_SCHEME=https
-
-TRAEFIK_DASHBOARD_DOMAIN=traefik.odoocker.test
-TRAEFIK_DASHBOARD_ENTRYPOINTS=websecure
-TRAEFIK_DASHBOARD_TLS_CERTRESOLVER=leresolver
-TRAEFIK_DASHBOARD_SERVICE=api@internal
-
 #-------------#
 #    Nginx    #
 #-------------#

.gitignore

@@ -9,5 +9,3 @@ docker-compose.override.yml
 
 # Ignores any __pycache__ folder.
 __pycache__
-
-upgrade/

README.md

@@ -43,7 +43,6 @@ In essence, Odoocker isn't just another tool, it's a philosophy. So, whether you
 1. **Clone and Configure**:
 ```
 git clone git@github.com:odoocker/odoocker.git
-cd odoocker
 cp .env.example .env && cp docker-compose.override.local.yml docker-compose.override.yml
 ```
 2. **Hosts & Domains**: To ensure everything runs smoothly, remember to add the necessary domains to your hosts file.
@@ -156,7 +155,6 @@ docker-compose down
 ```
 cp docker-compose.override.production.yml docker-compose.override.yml
 ```
-- Update .env `SERVICES` (add `acme`) and `ACME_CA_URI` (use production link).
 - Make sure the DNS record of your `DOMAIN` is pointing to your server.
 - Rebuild the containers
 ```

docker-compose.override.local.yml

@@ -12,11 +12,6 @@ services:
     ports:
       - 5432:5432
 
-  pgbouncer:
-    restart: 'no'
-    expose:
-      - 5432/tcp
-
   nginx:
     restart: 'no'
 
@@ -26,19 +21,13 @@ services:
       - 80:80
       - 443:443
 
-  traefik: 
-    restart: 'no'
-    ports:
-      - 80:80
-      - 443:443
-
-  acme-companion:
+  letsencrypt:
     restart: 'no'
 
-  keydb:
+  redis:
     restart: 'no'
 
-  minio:
+  s3:
     restart: 'no'
 
   pgadmin:

docker-compose.override.production.yml

@@ -12,11 +12,6 @@ services:
     ports:
       - 127.0.0.1:5432:5432
 
-  pgbouncer:
-    restart: unless-stopped
-    expose:
-      - 5432/tcp
-
   nginx:
     restart: unless-stopped
 
@@ -26,31 +21,13 @@ services:
       - 80:80
       - 443:443
 
-  traefik: 
-    restart: unless-stopped
-    ports:
-      - 80:80
-      - 443:443
-    command:
-      - --entrypoints.websecure.address=${ENTRYPOINTS_WEBSECURE_ADDRESS}
-      - --certificatesresolvers.leresolver.acme.httpchallenge=${ACME_HTTPCHALLENGE}
-      - --certificatesresolvers.leresolver.acme.httpchallenge.entrypoint=${ACME_HTTPCHALLENGE_ENTRYPOINT}
-      - --certificatesresolvers.leresolver.acme.email=${ACME_EMAIL}
-      - --certificatesresolvers.leresolver.acme.storage=${ACME_STORAGE}
-      - --certificatesresolvers.leresolver.acme.caserver=${ACME_CASERVER}
-    labels:
-      - traefik.http.routers.http-catchall.middlewares=${HTTP_CATCHALL_MIDDLEWARES}
-      - traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=${MIDDLEWARES_REDIRECT_SCHEME}
-      - traefik.http.routers.traefik-dashboard.entrypoints=${TRAEFIK_DASHBOARD_ENTRYPOINTS}
-      - traefik.http.routers.traefik-dashboard.tls.certresolver=${TRAEFIK_DASHBOARD_TLS_CERTRESOLVER}
-
-  acme-companion:
+  letsencrypt:
     restart: unless-stopped
 
-  keydb:
+  redis:
     restart: unless-stopped
 
-  minio:
+  s3:
     restart: unless-stopped
 
   pgadmin:

docker-compose.yml

@@ -1,6 +1,5 @@
 services:
   odoo:
-    container_name: odoo
     build:
       context: ./
       dockerfile: ./odoo/Dockerfile
@@ -19,7 +18,6 @@ services:
         - USE_S3
         - USE_SENTRY
     tty: true
-    shm_size: 1gb
     volumes:
       - odoo-data:${DATA_DIR}
       - ./odoo/extra-addons:${EXTRA_ADDONS}
@@ -57,14 +55,12 @@ services:
     profiles: [$ODOO_PROFILES]
 
   postgres:
-    container_name: postgres
     build: 
       context: ./
       dockerfile: ./postgres/Dockerfile
       args:
         - POSTGRES_TAG
     tty: true
-    shm_size: 1gb
     volumes:
       - pg-data:${PGDATA}
       - ./postgres/entrypoint.sh:/docker-entrypoint-initdb.d/entrypoint.sh
@@ -83,30 +79,13 @@ services:
       - internal
     profiles: [$POSTGRES_PROFILES]
 
-  pgbouncer:
-    image: edoburu/pgbouncer:latest
-    container_name: pgbouncer
-    restart: always
-    depends_on:
-      - postgres
-    environment:
-      - DB_HOST=${DB_HOST}
-      - DB_USER=${DB_USER}
-      - DB_PASSWORD=${DB_PASSWORD}
-      - MAX_CLIENT_CONN=${MAX_CLIENT_CONN}
-      - POOL_MODE=${POOL_MODE}
-      - ADMIN_USERS=${ADMIN_USERS}
-    profiles: [$PGBOUNCER_PROFILES]
-
   nginx:
-    container_name: nginx
     image: nginx:${NGINX_TAG}
     depends_on:
       - odoo
     tty: true
     expose:
       - 80/tcp
-    shm_size: 1gb
     volumes:
       - ./nginx/nginx.conf:${NGINX_CONF}
       - ./nginx/default.conf:${NGINX_DEFAULT_CONF}
@@ -120,12 +99,10 @@ services:
     profiles: [$NGINX_PROFILES]
 
   nginx-proxy:
-    container_name: nginx-proxy
     image: nginxproxy/nginx-proxy:${NGINX_PROXY_TAG}
     depends_on:
       - nginx
     tty: true
-    shm_size: 1gb
     volumes:
       - ./nginx-proxy/nginx.conf:${NGINX_CONF}
       - ./nginx-proxy/cors.conf:${NGINX_PROXY_CORS_CONF}
@@ -140,38 +117,7 @@ services:
       - internal
     profiles: [$NGINX_PROXY_PROFILES]
 
-  traefik:
-    container_name: traefik
-    image: "traefik:${TRAEFIK_TAG}"
-    networks:
-      - internal
-    command:
-      - --api.dashboard=${API_DASHBOARD}
-      - --api.insecure=${API_INSECURE}
-      - --api.debug=${API_DEBUG}
-      - --entrypoints.web.address=${ENTRYPOINTS_WEB_ADDRESS}
-      - --providers.docker
-      - --log.level=${TRAEFIK_LOG_LEVEL}
-      - --accesslog.filepath=${ACCESSLOG_FILEPATH}
-      - --serversTransport.insecureSkipVerify=${INSERCURE_SKIP_VERIFY}
-    tty: true
-    shm_size: 1gb
-    volumes:
-      - ${DOCKER_SOCK}:${DOCKER_SOCK}:ro
-      - ./acme.json:${ACME_JSON}
-      - traefik_logs:${TRAEFIK_LOGS}
-    labels:
-      - traefik.enable=${TRAEFIK_ENABLE}
-      # Catch all HTTP trafic and redirect it to HTTPS
-      - traefik.http.routers.http-catchall.rule=hostregexp(`{host:.+}`)
-      - traefik.http.routers.http-catchall.entrypoints=${HTTP_CATCHALL_ENTRYPOINTS}
-      # Traefik Dashboard route
-      - traefik.http.routers.traefik-dashboard.rule=Host(`${TRAEFIK_DASHBOARD_DOMAIN}`)
-      - traefik.http.routers.traefik-dashboard.service=${TRAEFIK_DASHBOARD_SERVICE}
-    profiles: [$TRAEFIK_PROFILES]
-
-  acme-companion:
-    container_name: acme-companion
+  letsencrypt:
     image: nginxproxy/acme-companion:${ACME_COMPANION_TAG}
     depends_on:
       - nginx-proxy
@@ -189,8 +135,7 @@ services:
       - internal
     profiles: [$ACME_COMPANION_PROFILES]
 
-  keydb:
-    container_name: keydb
+  redis:
     image: eqalpha/keydb:${KEYDB_TAG}
     platform: linux/amd64
     ports:
@@ -201,8 +146,7 @@ services:
       - internal
     profiles: [$KEYDB_PROFILES]
 
-  minio:
-    container_name: minio
+  s3:
     image: minio/minio:${MINIO_TAG}
     environment:
       - MINIO_ROOT_USER
@@ -211,7 +155,6 @@ services:
       - VIRTUAL_HOST=${MINIO_VIRTUAL_HOST}
       - VIRTUAL_PORT=${MINIO_CONSOLE_PORT}
     command: server ${MINIO_DATA} --console-address ":${MINIO_CONSOLE_PORT}"
-    shm_size: 1gb
     volumes:
       - s3-data:${MINIO_DATA}
     ports:
@@ -222,7 +165,6 @@ services:
     profiles: [$MINIO_PROFILES]
 
   pgadmin:
-    container_name: pgadmin
     build:
       context: ./
       dockerfile: ./pgadmin/Dockerfile
@@ -232,7 +174,6 @@ services:
       - nginx-proxy
     expose:
       - 80
-    shm_size: 1gb
     volumes:
       - pgadmin-data:${PGADMIN_DATA}
     environment:
@@ -275,7 +216,6 @@ volumes:
   vhost:
   certs:
   acme:
-  traefik_logs:
 
 networks:
   internal:

odoo/Dockerfile

@@ -53,7 +53,7 @@ RUN apt-get update && apt-get install -y \
     git \
     git-man \
     less \
-    libcbor0.8 \
+    libcbor0 \
     libcurl3-gnutls \
     libedit2 \
     liberror-perl \
@@ -78,8 +78,10 @@ RUN python3 -m pip install -r /tmp/requirements.txt && \
 #    Odoo Enterprise + Third Party Addons    #
 #--------------------------------------------#
 # Create third-party-addons directory and clone them
+RUN mkdir -p ${THIRD_PARTY_ADDONS}
 COPY --chown=odoo:odoo ./odoo/clone-addons.sh /
 COPY --chown=odoo:odoo ./odoo/third-party-addons.txt /
+# RUN /clone-addons.sh && chown odoo:odoo -R ${THIRD_PARTY_ADDONS}
 RUN /clone-addons.sh
 
 #-----------------------#

odoo/clone-addons.sh

@@ -25,7 +25,7 @@ clone_and_copy_modules() {
 
     # Clone and copy logic for enterprise repository
     if [[ $repo_type == "enterprise" ]]; then
-        if [ -n "$GITHUB_USER" ] && [ -n "$GITHUB_ACCESS_TOKEN" ]; then
+        if [[ ! -d "${ENTERPRISE_ADDONS}" ]] && [ -n "$GITHUB_USER" ] && [ -n "$GITHUB_ACCESS_TOKEN" ]; then
             $clone_cmd --depth 1 --branch ${ODOO_TAG} --single-branch --no-tags
         fi
     else
@@ -84,8 +84,6 @@ expand_env_vars() {
 
 # Read the configuration file and process each line
 while IFS= read -r line; do
-    mkdir -p ${ENTERPRISE_ADDONS}
-    mkdir -p ${THIRD_PARTY_ADDONS}
     [[ -z "$line" || "$line" == \#* ]] && continue
     clone_and_copy_modules $(expand_env_vars "$line")
 done < "third-party-addons.txt"

odoo/odoo.conf

@@ -64,7 +64,7 @@ xmlrpcs_interface = ${XMLRPCS_INTERFACE}
 ; --xmlrpcs-port
 xmlrpcs_port = ${XMLRPCS_PORT}
 
-; --gevent-port
+; --gevent-port | --longpolling-port (deprecated)
 gevent_port = ${GEVENT_PORT}
 
 ; --no-http | --no-xmlrpc

odoo/requirements.txt

@@ -1,5 +1,5 @@
-debugpy==1.8.0
-websocket-client==1.7.0
-redis==5.0.1
-boto3==1.34.23
+debugpy
+websocket-client
+redis
+boto3
 sentry-sdk==1.9.0 # Fixed because Odoo depends on urllib3==1.26.5

pgbouncer/docker-entrypoint-initdb.d/init.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-    CREATE USER dbuser WITH ENCRYPTED PASSWORD 'dbuser';
-    CREATE DATABASE dbuser OWNER dbuser;
-
-    CREATE USER user1 WITH ENCRYPTED PASSWORD 'user1';
-    CREATE DATABASE user1 OWNER user1;
-
-    CREATE USER user2 WITH ENCRYPTED PASSWORD 'user2';
-    CREATE DATABASE user2 OWNER user2;
-
-    CREATE USER user3 WITH ENCRYPTED PASSWORD 'user3';
-    CREATE DATABASE user3 OWNER user3;
-
-    CREATE USER odoo WITH ENCRYPTED PASSWORD 'odoo';
-    CREATE DATABASE odoo OWNER odoo;
-
-EOSQL