Skip to content

Commit 98d13e8

Browse files
committed
Local development: use nodemon instead of watchmedo
See readthedocs/readthedocs.org#9338
1 parent b69771c commit 98d13e8

File tree

4 files changed

+12
-18
lines changed

4 files changed

+12
-18
lines changed

dockerfiles/docker-compose.yml

+2
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ services:
8181
- ${PWD}/common/dockerfiles/entrypoints/common.sh:/usr/src/app/docker/common.sh
8282
- ${PWD}/common/dockerfiles/entrypoints/celery.sh:/usr/src/app/docker/celery.sh
8383
- ${PWD}/common/dockerfiles/scripts/wait_for_search.py:/usr/src/app/docker/scripts/wait_for_search.py
84+
- ${PWD}/common/dockerfiles/nodemon.json:/usr/src/app/checkouts/nodemon.json
8485
- ${PWD}/${RTDDEV_PATH_EXT:-../readthedocs-ext}:/usr/src/app/checkouts/readthedocs-ext
8586
- ${PWD}/${RTDDEV_PATH_EXT_THEME:-../ext-theme}:/usr/src/app/checkouts/ext-theme
8687
links:
@@ -104,6 +105,7 @@ services:
104105
volumes:
105106
- ${PWD}/common/dockerfiles/entrypoints/common.sh:/usr/src/app/docker/common.sh
106107
- ${PWD}/common/dockerfiles/entrypoints/build.sh:/usr/src/app/docker/build.sh
108+
- ${PWD}/common/dockerfiles/nodemon.json:/usr/src/app/checkouts/nodemon.json
107109
- ${PWD}/${RTDDEV_PATH_EXT:-../readthedocs-ext}:/usr/src/app/checkouts/readthedocs-ext
108110
- ${PWD}/${RTDDEV_PATH_EXT_THEME:-../ext-theme}:/usr/src/app/checkouts/ext-theme
109111

dockerfiles/entrypoints/build.sh

+1-9
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,5 @@ if [ -n "${DOCKER_NO_RELOAD}" ]; then
1616
$CMD
1717
else
1818
echo "Running Docker with reload"
19-
watchmedo auto-restart \
20-
--patterns="./readthedocs/*.py;./readthedocsinc/*.py" \
21-
--ignore-patterns="*.#*.py;*.pyo;*.pyc;*flycheck*.py;*test*;*migrations*;*management/commands*" \
22-
--ignore-directories \
23-
--recursive \
24-
--signal=SIGTERM \
25-
--interval=5 \
26-
-- \
27-
$CMD
19+
nodemon --config ../nodemon.json --exec $CMD
2820
fi

dockerfiles/entrypoints/celery.sh

+1-9
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,5 @@ if [ -n "${DOCKER_NO_RELOAD}" ]; then
1111
$CMD
1212
else
1313
echo "Running Docker with reload"
14-
watchmedo auto-restart \
15-
--patterns="./readthedocs/*.py;./readthedocsinc/*.py" \
16-
--ignore-patterns="*.#*.py;*.pyo;*.pyc;*flycheck*.py;*test*;*migrations*;*management/commands*" \
17-
--ignore-directories \
18-
--recursive \
19-
--signal=SIGTERM \
20-
--interval=5 \
21-
-- \
22-
$CMD
14+
nodemon --config ../nodemon.json --exec $CMD
2315
fi

dockerfiles/nodemon.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"verbose": true,
3+
"delay": 2500,
4+
"ext": "py",
5+
"watch": ["readthedocs", "readthedocsinc"],
6+
"ignore": [".tox/*", ".direnv/*", "user_builds/*", "*/management/commands*", "*migrations/*", "*test*", "*.pyc", "*.pyo"],
7+
"signal": "SIGTERM"
8+
}

0 commit comments

Comments
 (0)