Skip to content
Snippets Groups Projects
Commit 349a1a91 authored by Vincent Hatakeyama's avatar Vincent Hatakeyama
Browse files

:pencil: Use the presence of a Dockerfile as a sign that the current directory is a super project

Avoids starting to create files that are not cleaned up.
parent f5078e31
No related branches found
No related tags found
2 merge requests!78🚑 fix conf2reST,!77Topic/default/pylint
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
Change isort options to be able to show differences. Change isort options to be able to show differences.
Use the presence of a Dockerfile as a sign that the current directory is a super project. Avoids starting to create files by error.
14.0.0 14.0.0
------ ------
......
...@@ -95,6 +95,11 @@ ...@@ -95,6 +95,11 @@
dev = nmspc.dev dev = nmspc.dev
push = nmspc.push push = nmspc.push
dockerfile = "Dockerfile"
if not os.path.exists(dockerfile):
_logger.critical("No dockerfile found")
return 1
c = Config() c = Config()
registry = c.registry registry = c.registry
project = c.image project = c.image
...@@ -134,7 +139,6 @@ ...@@ -134,7 +139,6 @@
a = arg.split("=") a = arg.split("=")
buildargs[a[0]] = a[1] buildargs[a[0]] = a[1]
_logger.debug("Build args: %s", buildargs) _logger.debug("Build args: %s", buildargs)
dockerfile = "Dockerfile"
if dev: if dev:
debug_dockerfile = "Dockerfile.debug" debug_dockerfile = "Dockerfile.debug"
call(["cp", dockerfile, debug_dockerfile]) call(["cp", dockerfile, debug_dockerfile])
...@@ -144,7 +148,7 @@ ...@@ -144,7 +148,7 @@
myfile.write("RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -qq ") myfile.write("RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -qq ")
if odoo_type in ("odoo11", "odoo13", "odoo15"): if odoo_type in ("odoo11", "odoo13", "odoo15"):
myfile.write( myfile.write(
"python3-watchdog python3-ipdb python3-pyinotify " "python3-wheel\n" "python3-watchdog python3-ipdb python3-pyinotify python3-wheel\n"
) )
# newer setuptools_scm>6 is not compatible with python 3.5 due # newer setuptools_scm>6 is not compatible with python 3.5 due
# to the use of f-strings # to the use of f-strings
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment