8
8
DOCKER_COMPOSE_WEBPACK = 'common/dockerfiles/docker-compose-webpack.yml'
9
9
DOCKER_COMPOSE_ASSETS = 'dockerfiles/docker-compose-assets.yml'
10
10
DOCKER_COMPOSE_OVERRIDE = 'docker-compose.override.yml'
11
- DOCKER_COMPOSE_COMMAND = f'docker- compose --project-directory=. -f { DOCKER_COMPOSE } -f { DOCKER_COMPOSE_OVERRIDE } -f { DOCKER_COMPOSE_SEARCH } -f { DOCKER_COMPOSE_WEBPACK } '
11
+ DOCKER_COMPOSE_COMMAND = f'docker compose --project-directory=. -f { DOCKER_COMPOSE } -f { DOCKER_COMPOSE_OVERRIDE } -f { DOCKER_COMPOSE_SEARCH } -f { DOCKER_COMPOSE_WEBPACK } '
12
12
13
13
@task (help = {
14
14
'cache' : 'Build Docker image using cache (default: False)' ,
@@ -19,10 +19,10 @@ def build(c, cache=False):
19
19
c .run (f'{ DOCKER_COMPOSE_COMMAND } build { cache_opt } ' , pty = True )
20
20
21
21
@task (help = {
22
- 'command' : 'Command to pass directly to "docker- compose"' ,
22
+ 'command' : 'Command to pass directly to "docker compose"' ,
23
23
})
24
24
def compose (c , command ):
25
- """Pass the command to docker- compose directly."""
25
+ """Pass the command to docker compose directly."""
26
26
c .run (f'{ DOCKER_COMPOSE_COMMAND } { command } ' , pty = True )
27
27
28
28
@task (help = {
@@ -56,7 +56,7 @@ def up(c, search=True, init=False, reload=True, webpack=False, ext_theme=False,
56
56
cmd .append ('DOCKER_NO_RELOAD=t' if not reload else 'DOCKER_NO_RELOAD=' )
57
57
cmd .append (f'RTD_LOGGING_LEVEL={ log_level } ' )
58
58
59
- cmd .append ('docker- compose' )
59
+ cmd .append ('docker compose' )
60
60
cmd .append ('--project-directory=.' )
61
61
cmd .append (f'-f { DOCKER_COMPOSE } ' )
62
62
cmd .append (f'-f { DOCKER_COMPOSE_OVERRIDE } ' )
@@ -165,7 +165,7 @@ def test(c, arguments='', running=True):
165
165
@task
166
166
def buildassets (c ):
167
167
"""Build all assets for the application and push them to backend storage"""
168
- c .run (f'docker- compose -f { DOCKER_COMPOSE_ASSETS } run --rm assets bash -c "npm ci && node_modules/bower/bin/bower --allow-root update && npm run build"' , pty = True )
168
+ c .run (f'docker compose -f { DOCKER_COMPOSE_ASSETS } run --rm assets bash -c "npm ci && node_modules/bower/bin/bower --allow-root update && npm run build"' , pty = True )
169
169
c .run (f'{ DOCKER_COMPOSE_COMMAND } run --rm web python3 manage.py collectstatic --noinput' , pty = True )
170
170
171
171
0 commit comments