NextERP/Odoo18-Base
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update
Some checks are pending
Setup Native Action / native (3.12.7) (push) Waiting to run
Details
Setup Native Action / docker (3.12.7) (push) Waiting to run
Details

Browse Source
This commit is contained in:
KaySar12 2025-03-27 10:35:53 +07:00
parent 8e0709bd1f
commit a9a3fa8f01
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -32,7 +32,9 @@ ADDONS=${PWD}/addons,${PWD}/odoo/addons,${PWD}/extra-addons
BACKUP=${CDN}/raw/branch/main/backup/${VERSION}/odoo18-main_2025-01-15_08-05-47.zip BACKUP=${CDN}/raw/branch/main/backup/${VERSION}/odoo18-main_2025-01-15_08-05-47.zip
AUTOMATION_PATH=${PWD}/automation AUTOMATION_PATH=${PWD}/automation
########### Packaging #########
package-deb:
${PYTHON} ${SETUP_PATH}/package.py --build-deb -b ${PWD}/build
########### Automation ######### ########### Automation #########
deploy-native: deploy-native:
@echo "Not implemented" @echo "Not implemented"

2
extra-addons

@ -1 +1 @@
Subproject commit 8a58d658101ba060bea44703dff269d451c59522 Subproject commit 1211f8b6ce4fec0328236badcb2e6d73f38aab87

24
setup/package.py
View File

@ -36,26 +36,18 @@ GPGID = os.getenv("GPGID")
DOCKERVERSION = VERSION.replace("+", "") DOCKERVERSION = VERSION.replace("+", "")
INSTALL_TIMEOUT = 600 INSTALL_TIMEOUT = 600
if os.getuid() == 0:
DOCKERUSER = """ DOCKERUSER = """
RUN mkdir -p /var/lib/odoo /data && \ RUN mkdir /var/lib/odoo && \
groupadd -r odoo && \
useradd -m -d /var/lib/odoo -s /bin/bash -g odoo odoo && \
chown odoo:odoo /var/lib/odoo /data
USER odoo
"""
else:
DOCKERUSER = """
RUN mkdir /var/lib/odoo && \
groupadd -g %(group_id)s odoo && \ groupadd -g %(group_id)s odoo && \
useradd -u %(user_id)s -g odoo odoo -d /var/lib/odoo && \ useradd -u %(user_id)s -g odoo odoo -d /var/lib/odoo && \
mkdir /data && \ mkdir /data && \
chown odoo:odoo /var/lib/odoo /data chown odoo:odoo /var/lib/odoo /data
USER odoo USER odoo
""" % { """ % {
"group_id": os.getgid(), "group_id": os.getgid() if os.getgid() != 0 else 1000, # Use 1000 if the group ID is 0 (root)
"user_id": os.getuid(), "user_id": os.getuid() if os.getuid() != 0 else 1000, # Use 1000 if the user ID is 0 (root)
} }
class OdooTestTimeoutError(Exception): class OdooTestTimeoutError(Exception):