Merge branch 'main' into humitos/translations-task

Author: humitos

dockerfiles/tasks.py

@@ -8,7 +8,7 @@
 DOCKER_COMPOSE_WEBPACK = 'common/dockerfiles/docker-compose-webpack.yml'
 DOCKER_COMPOSE_ASSETS = 'dockerfiles/docker-compose-assets.yml'
 DOCKER_COMPOSE_OVERRIDE = 'docker-compose.override.yml'
-DOCKER_COMPOSE_COMMAND = f'docker-compose -f {DOCKER_COMPOSE_OVERRIDE} -f {DOCKER_COMPOSE} -f {DOCKER_COMPOSE_SEARCH} -f {DOCKER_COMPOSE_WEBPACK}'
+DOCKER_COMPOSE_COMMAND = f'docker-compose --project-directory=. -f {DOCKER_COMPOSE} -f {DOCKER_COMPOSE_OVERRIDE} -f {DOCKER_COMPOSE_SEARCH} -f {DOCKER_COMPOSE_WEBPACK}'
 
 @task(help={
     'cache': 'Build Docker image using cache (default: False)',
@@ -51,6 +51,7 @@ def up(c, search=True, init=False, reload=True, webpack=False, ext_theme=False,
     cmd.append('DOCKER_NO_RELOAD=t' if not reload else 'DOCKER_NO_RELOAD=')
 
     cmd.append('docker-compose')
+    cmd.append('--project-directory=.')
     cmd.append(f'-f {DOCKER_COMPOSE}')
     cmd.append(f'-f {DOCKER_COMPOSE_OVERRIDE}')