diff --git a/Dockerfile.odoo-static b/Dockerfile.odoo-static deleted file mode 100644 index c2d10756b4db868faf6443d9d29b9e45ce4c25a2_RG9ja2VyZmlsZS5vZG9vLXN0YXRpYw==..0000000000000000000000000000000000000000 --- a/Dockerfile.odoo-static +++ /dev/null @@ -1,15 +0,0 @@ -FROM nginx:alpine -ARG REVISION="" -ARG VENDOR="" -ARG VERSION="" -ARG AUTHORS="" -ARG CREATED="" -ARG TITLE="" -LABEL org.opencontainers.image.revision=$REVISION -LABEL org.opencontainers.image.vendor=$VENDOR -LABEL org.opencontainers.image.version=$VERSION -LABEL org.opencontainers.image.authors=$AUTHORS -LABEL org.opencontainers.image.created=$CREATED -LABEL org.opencontainers.image.title=$TITLE - -ADD static /usr/share/nginx/html diff --git a/NEWS.rst b/NEWS.rst index c2d10756b4db868faf6443d9d29b9e45ce4c25a2_TkVXUy5yc3Q=..1eb9dd7ea37d3297a950b3d8db177397d2e09e3e_TkVXUy5yc3Q= 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -2,7 +2,7 @@ History ======= -13.4.0 +14.0.0 ------ Allow not setting the database owner in do_tests. diff --git a/odoo_scripts/docker_build_clean.py b/odoo_scripts/docker_build_clean.py index c2d10756b4db868faf6443d9d29b9e45ce4c25a2_b2Rvb19zY3JpcHRzL2RvY2tlcl9idWlsZF9jbGVhbi5weQ==..1eb9dd7ea37d3297a950b3d8db177397d2e09e3e_b2Rvb19zY3JpcHRzL2RvY2tlcl9idWlsZF9jbGVhbi5weQ== 100644 --- a/odoo_scripts/docker_build_clean.py +++ b/odoo_scripts/docker_build_clean.py @@ -12,5 +12,5 @@ _logger = logging.getLogger(__name__) -__version__ = "1.0.0" +__version__ = "2.0.0" __date__ = "2020-06-30" @@ -16,5 +16,5 @@ __date__ = "2020-06-30" -__updated__ = "2020-06-30" +__updated__ = "2021-12-10" def __parser(): @@ -28,7 +28,7 @@ program_license = """%s Created by Vincent Hatakeyama on %s. - Copyright 2020 XCG Consulting. All rights reserved. + Copyright 2020, 2021 XCG Consulting. All rights reserved. Licensed under the MIT License @@ -58,7 +58,7 @@ """Clean up after a build""" if os.path.exists(MODULES_LIST_FILE): os.remove(MODULES_LIST_FILE) - for directory in ("odoo_modules", "static", "odoo_setup"): + for directory in ("odoo_modules", "odoo_setup"): if os.path.exists(directory): shutil.rmtree(directory) diff --git a/odoo_scripts/docker_build_copy.py b/odoo_scripts/docker_build_copy.py index c2d10756b4db868faf6443d9d29b9e45ce4c25a2_b2Rvb19zY3JpcHRzL2RvY2tlcl9idWlsZF9jb3B5LnB5..1eb9dd7ea37d3297a950b3d8db177397d2e09e3e_b2Rvb19zY3JpcHRzL2RvY2tlcl9idWlsZF9jb3B5LnB5 100644 --- a/odoo_scripts/docker_build_copy.py +++ b/odoo_scripts/docker_build_copy.py @@ -13,5 +13,5 @@ _logger = logging.getLogger(__name__) -__version__ = "1.0.1" +__version__ = "2.0.0" __date__ = "2020-06-30" @@ -17,5 +17,5 @@ __date__ = "2020-06-30" -__updated__ = "2020-09-11" +__updated__ = "2021-12-10" def __parser(): @@ -29,7 +29,7 @@ program_license = """%s Created by Vincent Hatakeyama on %s. - Copyright 2020 XCG Consulting. All rights reserved. + Copyright 2020, 2021 XCG Consulting. All rights reserved. Licensed under the MIT License @@ -81,31 +81,6 @@ ) _logger.debug(" ".join(cmd)) call(cmd) - # this only sync static from our modules - target = "static" - _logger.info("Copying static files to %s", target) - if not os.path.exists(target): - os.mkdir(target) - cmd = ( - [ - "rsync", - "--delete", - "--cvs-exclude", - "--include=core", - "--exclude=.hg*", - "--exclude=.git*", - "--links", - "--include='/*/static/***'", - "--exclude='/*/*'", - "-r", - "--times", - "--prune-empty-dirs", - ] - + modules - + [target] - ) - _logger.debug(" ".join(cmd)) - call(cmd) # copy setup files to odoo_setup source = "setup/" target = "odoo_setup"