feat: docker image

This commit is contained in:
Janik von Rotz committed 2024-05-24 15:05:43 +02:00
1 parent 494a043e04
commit f899cf56ae
8 files changed
+33 -19

No files matched your search

+2 -1
View File
@@ -22,6 +22,7 @@ dist
origin.dump
filestore
upgraded.dump
thirdparty
thirdparty/*
!thirdparty/.gitkeep
.idea/
.obsidian
+15 -6
View File
@@ -22,11 +22,20 @@ entrypoint_log() {
fi
}
# Search for module manifest files and return list of module paths
ODOO_MODULE_PATH=$(echo "$ODOO_ADDONS_PATH" | tr "," "\n" | xargs -I {} find {} -type f -name "__manifest__.py" | xargs dirname | sort -u | tr "\n" ",")
set_odoo_addons_path() {
if [ -n "$ODOO_ADDONS_PATH" ]; then
# Set parent folder of module paths as new addons path
ODOO_ADDONS_PATH=$(echo "$ODOO_MODULE_PATH" | tr "," "\n" | xargs -I {} dirname {} | sort -u | tr "\n" "," | sed 's/,$//')
entrypoint_log "$ME: Update ODOO_ADDONS_PATH env var"
# Search for module manifest files and return list of module paths
ODOO_MODULE_PATH=$(echo "$ODOO_ADDONS_PATH" | tr "," "\n" | xargs -I {} find {} -type f -name "__manifest__.py" | xargs dirname | sort -u | tr "\n" ",")
# Set parent folder of module paths as new addons path
ODOO_ADDONS_PATH=$(echo "$ODOO_MODULE_PATH" | tr "," "\n" | xargs -I {} dirname {} | sort -u | tr "\n" "," | sed 's/,$//')
fi
}
set_odoo_addons_path
auto_envsubst() {
local TEMPLATE_FILE="${ODOO_ENVSUBST_TEMPLATE_FILE:-/etc/odoo/odoo.conf.template}"
@@ -43,11 +52,11 @@ auto_envsubst() {
auto_envsubst
echo "List python packages:"
entrypoint_log "$ME: List python packages:"
pip list
echo "Running Odoo as user: $USER"
entrypoint_log "$ME: Running Odoo as user: $USER"
# 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
+2 -2
View File
@@ -14,8 +14,7 @@ services:
USER: odoo
PASSWORD: odoo
PORT: ${POSTGRES_PORT}
# ODOO_ADDONS_PATH: "${DOCKER_ADDONS_PATH}"
ODOO_ADDONS_PATH: /mnt/addons/,/mnt/oca/,/mnt/enterprise,/mnt/themes/
ODOO_ADDONS_PATH: /mnt/addons/,/mnt/oca/,/mnt/enterprise,/mnt/themes/,/mnt/thirdparty
ports:
- "127.0.0.1:${ODOO_PORT}:${ODOO_PORT}"
volumes:
@@ -24,6 +23,7 @@ services:
- ./oca:/mnt/oca
- ./enterprise:/mnt/enterprise
- ./themes:/mnt/themes
- ./thirdparty:/mnt/thirdparty
admin:
container_name: admin
image: dpage/pgadmin4:6
+1 -1
Submodule odoo updated: 51bc2f8c68...391a427620.
+11 -7
View File
@@ -486,9 +486,14 @@ function install-requirements() {
FILE_NAME=$(basename "$FILE_PATH")
if [[ "$FILE_NAME" != "requirements.txt" ]]; then echo "\$1 must point to requirements.txt file."; exit; fi
activate-venv
echo "Installing python packages from $FILE_PATH ..."
pip install -r "$FILE_PATH"
if [ "$( docker container inspect -f '{{.State.Running}}' odoo )" == "true" ]; then
echo "Installing python packages in Docker container ..."
docker exec -u root odoo python -m pip install -r "/mnt/$FILE_PATH"
else
activate-venv
echo "Installing python packages in virutal env ..."
pip install -r "$FILE_PATH"
fi
}
function test-module() {
@@ -1070,7 +1075,7 @@ function update-docs() {
function visualize-dependencies() {
if test -z "$1"; then echo "\$1 is empty."; exit; fi
MODULE_DIR="$1"
OUTPUT_FILE="tmp/module_dependencies.mmd"
mkdir -p tmp
@@ -1081,10 +1086,9 @@ function visualize-dependencies() {
MODULE_NAME=$(basename "$MODULE_PATH")
MANIFEST_FILE="$MODULE_PATH/__manifest__.py"
if [[ -f $MANIFEST_FILE ]]; then
DEPENDENCIES=$(grep -Po '(?<="depends": \[)[^\]]*' "$MANIFEST_FILE" | tr -d '"')
DEPENDENCIES=$(grep -Po '(?<="depends": \[)[^\]]*' "$MANIFEST_FILE" | tr -d '"[] ')
if [[ -n "$DEPENDENCIES" ]]; then
DEPENDENCIES=$(echo "$DEPENDENCIES" | tr -d '[:space:]' | tr ',' '\n')
for DEPENDENCY in "$DEPENDENCIES"; do
for DEPENDENCY in $(echo "$DEPENDENCIES" | tr ',' '\n'); do
echo " $MODULE_NAME --> $DEPENDENCY" >> "$OUTPUT_FILE"
done
fi
+1 -1
Submodule themes updated: e69120f149...1d0f0fc2ca.
View File
Whitespace-only changes.