diff options
| author | Christophe Monniez <moc@odoo.com> | 2019-09-27 10:01:58 +0000 |
|---|---|---|
| committer | Christophe Monniez <moc@odoo.com> | 2019-10-02 14:24:53 +0000 |
| commit | 8c4c4394730bf77d44f831ca97d565bc2fb14e47 (patch) | |
| tree | c542aac4c21853e6ff62dec1fbf1e916a5f48ce2 /setup/redhat | |
| parent | e10a402531e879636d2c57606378d4a13cc696a4 (diff) | |
[REF] packaging: use docker to build packages
Actually, docker is used to test Linux packages once they are built.
The packaging process is done on the host system where package.py is
run.
Consequences:
* difficult to reproduce an exact same build on another host
* changing a Debian/Ubuntu target version means some upgrade steps
on the build host (mix that with the fact that the host also
could build old Odoo versions)
* Fedora rpm package is built on an Ubuntu system (which is not a
real problem but it could be)
With this commit, the package.py utility is refactored to use Docker
containers to build the Gnu/Linux packages.
Also, the Debian package is adapted for Debian Buster, the RPM package
is built based on Fedora 30.
Some minor changes are also made in the windows packaging system.
closes odoo/odoo#37766
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
Diffstat (limited to 'setup/redhat')
| -rw-r--r-- | setup/redhat/install.sh | 2 | ||||
| -rw-r--r-- | setup/redhat/postinstall.sh | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/setup/redhat/install.sh b/setup/redhat/install.sh index 982cc8759e9..b7a7f3eb40d 100644 --- a/setup/redhat/install.sh +++ b/setup/redhat/install.sh @@ -1,3 +1,3 @@ #!/bin/sh set -e -python3 setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib usr/lib/python3.6/site-packages/ +python3 setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib usr/lib/python3.7/site-packages/ diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh index e6ee9106f7d..c14dd9a55a4 100644 --- a/setup/redhat/postinstall.sh +++ b/setup/redhat/postinstall.sh @@ -10,12 +10,6 @@ ODOO_LOG_DIR=/var/log/odoo ODOO_LOG_FILE=$ODOO_LOG_DIR/odoo-server.log ODOO_USER="odoo" -if [ -d /usr/lib/python3.7 ]; then - SITE_PACK_DIR37=/usr/lib/python3.7/site-packages - [[ ! -d ${SITE_PACK_DIR37} ]] && mkdir -p ${SITE_PACK_DIR37} - ln -s /usr/lib/python3.6/site-packages/odoo ${SITE_PACK_DIR37}/odoo -fi - if ! getent passwd | grep -q "^odoo:"; then groupadd $ODOO_GROUP adduser --system --no-create-home $ODOO_USER -g $ODOO_GROUP @@ -34,7 +28,7 @@ db_host = False db_port = False db_user = $ODOO_USER db_password = False -addons_path = /usr/lib/python3.6/site-packages/odoo/addons +addons_path = /usr/lib/python3.7/site-packages/odoo/addons " > $ODOO_CONFIGURATION_FILE chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE chmod 0640 $ODOO_CONFIGURATION_FILE |