|
@@ -5,7 +5,7 @@ from doit.tools import LongRunning
|
|
|
|
|
|
from dodo_utils import wait_net_service, wait_pgsql_db, \
|
|
|
up2date_hasimage, up2date_anyimages, \
|
|
|
- run_task_func
|
|
|
+ run_task_func, scan_dir
|
|
|
|
|
|
COMPOSE = 'docker-compose -p feedati'
|
|
|
DOIT_CONFIG = {'default_tasks': ['up']}
|
|
@@ -17,8 +17,7 @@ def task_build():
|
|
|
'uptodate': [up2date_anyimages],
|
|
|
'file_dep': ['docker-compose.yml',
|
|
|
'rss-bridge/Dockerfile',
|
|
|
- ] + [os.path.join('docker', fname)
|
|
|
- for fname in os.listdir('docker')],
|
|
|
+ ] + list(scan_dir('docker')),
|
|
|
'actions': [COMPOSE + ' build'],
|
|
|
'clean': [run_task_func(task__build_rm),
|
|
|
run_task_func(task__build_rmi)],
|