update
This commit is contained in:
parent
857dffc58f
commit
c2f10038b5
@ -12,7 +12,7 @@ import tempfile
|
|||||||
import textwrap
|
import textwrap
|
||||||
import time
|
import time
|
||||||
import traceback
|
import traceback
|
||||||
|
import stat
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from xmlrpc import client as xmlrpclib
|
from xmlrpc import client as xmlrpclib
|
||||||
|
|
||||||
@ -36,17 +36,26 @@ GPGID = os.getenv("GPGID")
|
|||||||
DOCKERVERSION = VERSION.replace("+", "")
|
DOCKERVERSION = VERSION.replace("+", "")
|
||||||
INSTALL_TIMEOUT = 600
|
INSTALL_TIMEOUT = 600
|
||||||
|
|
||||||
DOCKERUSER = """
|
if os.getuid() == 0:
|
||||||
RUN mkdir /var/lib/odoo && \
|
DOCKERUSER = """
|
||||||
groupadd -g %(group_id)s odoo && \
|
RUN mkdir -p /var/lib/odoo /data && \
|
||||||
useradd -u %(user_id)s -g odoo odoo -d /var/lib/odoo && \
|
groupadd -r odoo && \
|
||||||
mkdir /data && \
|
useradd -m -d /var/lib/odoo -s /bin/bash -g odoo odoo && \
|
||||||
chown odoo:odoo /var/lib/odoo /data
|
chown odoo:odoo /var/lib/odoo /data
|
||||||
USER odoo
|
USER odoo
|
||||||
""" % {
|
"""
|
||||||
"group_id": os.getgid(),
|
else:
|
||||||
"user_id": os.getuid(),
|
DOCKERUSER = """
|
||||||
}
|
RUN mkdir /var/lib/odoo && \
|
||||||
|
groupadd -g %(group_id)s odoo && \
|
||||||
|
useradd -u %(user_id)s -g odoo odoo -d /var/lib/odoo && \
|
||||||
|
mkdir /data && \
|
||||||
|
chown odoo:odoo /var/lib/odoo /data
|
||||||
|
USER odoo
|
||||||
|
""" % {
|
||||||
|
"group_id": os.getgid(),
|
||||||
|
"user_id": os.getuid(),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class OdooTestTimeoutError(Exception):
|
class OdooTestTimeoutError(Exception):
|
||||||
@ -202,6 +211,13 @@ def rpm_sign(args, file_name):
|
|||||||
rpmsign.expect(pexpect.EOF)
|
rpmsign.expect(pexpect.EOF)
|
||||||
|
|
||||||
|
|
||||||
|
def _set_permissions(path):
|
||||||
|
uid = os.getuid() # Get current user ID
|
||||||
|
gid = os.getgid() # Get current group ID
|
||||||
|
os.chown(path, uid, gid) # Set ownership
|
||||||
|
os.chmod(path, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) # Set full permissions
|
||||||
|
|
||||||
|
|
||||||
def _prepare_build_dir(args, win32=False, move_addons=True):
|
def _prepare_build_dir(args, win32=False, move_addons=True):
|
||||||
"""Copy files to the build directory"""
|
"""Copy files to the build directory"""
|
||||||
logging.info('Preparing build dir "%s"', args.build_dir)
|
logging.info('Preparing build dir "%s"', args.build_dir)
|
||||||
@ -254,6 +270,8 @@ def _prepare_build_dir(args, win32=False, move_addons=True):
|
|||||||
logging.warning(
|
logging.warning(
|
||||||
"Cannot remove '{}': {}".format(addon_path, rm_error)
|
"Cannot remove '{}': {}".format(addon_path, rm_error)
|
||||||
)
|
)
|
||||||
|
logging.info(f"Setting full permisson to {args.build_dir}")
|
||||||
|
_set_permissions(args.build_dir)
|
||||||
|
|
||||||
|
|
||||||
# Docker stuffs
|
# Docker stuffs
|
||||||
|
Loading…
Reference in New Issue
Block a user