Skip to content

Commit 11bdabe

Browse files
authored
Merge pull request #148 from readthedocs/set-project-dir-explicitily
Docker: set project directory explicitily
2 parents baa26aa + a6075cf commit 11bdabe

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

dockerfiles/tasks.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
DOCKER_COMPOSE_WEBPACK = 'common/dockerfiles/docker-compose-webpack.yml'
66
DOCKER_COMPOSE_ASSETS = 'dockerfiles/docker-compose-assets.yml'
77
DOCKER_COMPOSE_OVERRIDE = 'docker-compose.override.yml'
8-
DOCKER_COMPOSE_COMMAND = f'docker-compose -f {DOCKER_COMPOSE} -f {DOCKER_COMPOSE_OVERRIDE} -f {DOCKER_COMPOSE_SEARCH} -f {DOCKER_COMPOSE_WEBPACK}'
8+
DOCKER_COMPOSE_COMMAND = f'docker-compose --project-directory=. -f {DOCKER_COMPOSE} -f {DOCKER_COMPOSE_OVERRIDE} -f {DOCKER_COMPOSE_SEARCH} -f {DOCKER_COMPOSE_WEBPACK}'
99

1010
@task(help={
1111
'cache': 'Build Docker image using cache (default: False)',
@@ -48,6 +48,7 @@ def up(c, search=True, init=False, reload=True, webpack=False, ext_theme=False,
4848
cmd.append('DOCKER_NO_RELOAD=t' if not reload else 'DOCKER_NO_RELOAD=')
4949

5050
cmd.append('docker-compose')
51+
cmd.append('--project-directory=.')
5152
cmd.append(f'-f {DOCKER_COMPOSE}')
5253
cmd.append(f'-f {DOCKER_COMPOSE_OVERRIDE}')
5354

0 commit comments

Comments
 (0)