Skip to content

Commit fff5e13

Browse files
authored
Swapped Ghost core use of node --watch to nodemon for Docker hot reload (#26441)
no ref `node --watch` missed changes in lazily loaded modules when run in Docker, so `yarn dev` now runs through `nodemon` for reliable restarts on source edits. Upstream Node bug: nodejs/node#51621
1 parent e7737ce commit fff5e13

4 files changed

Lines changed: 54 additions & 10 deletions

File tree

‎docker/ghost-dev/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ ENV portal__url=/ghost/assets/portal/portal.min.js \
4343
announcementBar__url=/ghost/assets/announcement-bar/announcement-bar.min.js
4444

4545
# Source code will be mounted from host at /home/ghost/ghost/core
46-
# This allows node --watch to pick up file changes for hot-reload
46+
# This allows the Ghost dev script to pick up file changes for hot-reload
4747
WORKDIR /home/ghost/ghost/core
4848

4949
ENTRYPOINT ["/home/ghost/entrypoint.sh"]
50-
CMD ["node", "--watch", "--import=tsx", "index.js"]
50+
CMD ["yarn", "dev"]

‎docker/ghost-dev/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Minimal Docker image for running Ghost Core in development with hot-reload suppo
77
This lightweight image:
88
- Installs only Ghost Core dependencies
99
- Mounts source code from the host at runtime
10-
- Enables `node --watch` for automatic restarts on file changes
10+
- Enables `nodemon` for automatic restarts on file changes
1111
- Works with the Caddy gateway to proxy frontend assets from host dev servers
1212

1313
## Key Differences from Main Dockerfile

‎ghost/core/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"scripts": {
2323
"archive": "npm pack",
2424
"pack:standalone": "rm -rf package ghost-*.tgz && npm pack && tar -xzf ghost-*.tgz && cp ../../yarn.lock package/ && rm ghost-*.tgz",
25-
"dev": "node --watch --import=tsx index.js",
25+
"dev": "nodemon --watch . --watch ../i18n --watch ../parse-email-address --ext js,mjs,cjs,json,ts,tsx --exec \"node --import=tsx\" index.js",
2626
"build:assets": "yarn build:assets:css && yarn build:assets:js",
2727
"build:assets:js": "node bin/minify-assets.js",
2828
"build:assets:css": "postcss core/frontend/public/ghost.css --no-map --use cssnano -o core/frontend/public/ghost.min.css",
@@ -253,6 +253,7 @@
253253
"mocha-slow-test-reporter": "0.1.2",
254254
"mock-knex": "TryGhost/mock-knex#68948e11b0ea4fe63456098dfdc169bea7f62009",
255255
"nock": "13.5.6",
256+
"nodemon": "3.1.11",
256257
"papaparse": "5.3.2",
257258
"parse-prometheus-text-format": "1.1.1",
258259
"postcss": "8.5.6",

‎yarn.lock‎

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8891,9 +8891,9 @@
88918891
postcss-preset-env "^7.3.1"
88928892

88938893
"@tryghost/[email protected]", "@tryghost/[email protected]", "@tryghost/errors@^1.2.26", "@tryghost/errors@^1.2.3", "@tryghost/errors@^1.3.7", "@tryghost/errors@^1.3.8", "@tryghost/errors@^1.3.9":
8894-
version "1.3.8"
8895-
resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.3.8.tgz#d4212b52e876360b4fa8e303ae13ef86f3e95846"
8896-
integrity sha512-2+4ExAAWM0rFWC7FlzxQMzIvIEQKt/vQLxLyqJqCmAcJa4i2uqUPJHqd/X5BBRuSTuftgca7EAo7adESbHEkZw==
8894+
version "1.3.9"
8895+
resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.3.9.tgz#e1095f9f5b30888de70908fc54dea046b3b6959a"
8896+
integrity sha512-SETeT5FRtO3hV0tTkMF65a9BP+Z1n3LenwW6qmm6sWGCLk/s8sOahF3WQHGX3AnEOWAB4GjRHNxHMF7N21r0ag==
88978897
dependencies:
88988898
"@stdlib/utils-copy" "^0.2.0"
88998899
uuid "^9.0.0"
@@ -14319,7 +14319,7 @@ cheerio@^1.0.0-rc.12, cheerio@^1.0.0-rc.2, cheerio@~1.0.0-rc.12:
1431914319
parse5 "^7.0.0"
1432014320
parse5-htmlparser2-tree-adapter "^7.0.0"
1432114321

14322-
[email protected], chokidar@^3.3.0, chokidar@^3.4.1, chokidar@^3.5.3, chokidar@^3.6.0:
14322+
[email protected], chokidar@^3.3.0, chokidar@^3.4.1, chokidar@^3.5.2, chokidar@^3.5.3, chokidar@^3.6.0:
1432314323
version "3.6.0"
1432414324
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
1432514325
integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -15925,7 +15925,7 @@ [email protected], debug@^3.0.1, debug@^3.1.0, debug@^3.2.6:
1592515925
dependencies:
1592615926
ms "^2.1.1"
1592715927

15928-
debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6, debug@^4.4.0, debug@^4.4.1, debug@^4.4.3:
15928+
debug@4, debug@^4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6, debug@^4.4.0, debug@^4.4.1, debug@^4.4.3:
1592915929
version "4.4.3"
1593015930
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
1593115931
integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
@@ -21548,6 +21548,11 @@ iferr@^0.1.5:
2154821548
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
2154921549
integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
2155021550

21551+
ignore-by-default@^1.0.1:
21552+
version "1.0.1"
21553+
resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
21554+
integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==
21555+
2155121556
ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.2:
2155221557
version "5.3.2"
2155321558
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
@@ -26234,6 +26239,22 @@ [email protected], nodemailer@^6.6.3:
2623426239
resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.10.1.tgz#cbc434c54238f83a51c07eabd04e2b3e832da623"
2623526240
integrity sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==
2623626241

26242+
26243+
version "3.1.11"
26244+
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-3.1.11.tgz#04a54d1e794fbec9d8f6ffd8bf1ba9ea93a756ed"
26245+
integrity sha512-is96t8F/1//UHAjNPHpbsNY46ELPpftGUoSVNXwUfMk/qdjSylYrWSu1XavVTBOn526kFiOR733ATgNBCQyH0g==
26246+
dependencies:
26247+
chokidar "^3.5.2"
26248+
debug "^4"
26249+
ignore-by-default "^1.0.1"
26250+
minimatch "^3.1.2"
26251+
pstree.remy "^1.1.8"
26252+
semver "^7.5.3"
26253+
simple-update-notifier "^2.0.0"
26254+
supports-color "^5.5.0"
26255+
touch "^3.1.0"
26256+
undefsafe "^2.0.5"
26257+
2623726258
nopt@^3.0.6:
2623826259
version "3.0.6"
2623926260
resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -28841,6 +28862,11 @@ psl@^1.1.28, psl@^1.1.33:
2884128862
resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
2884228863
integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
2884328864

28865+
pstree.remy@^1.1.8:
28866+
version "1.1.8"
28867+
resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
28868+
integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==
28869+
2884428870
public-encrypt@^4.0.0:
2884528871
version "4.0.3"
2884628872
resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -30806,6 +30832,13 @@ simple-swizzle@^0.2.2:
3080630832
dependencies:
3080730833
is-arrayish "^0.3.1"
3080830834

30835+
simple-update-notifier@^2.0.0:
30836+
version "2.0.0"
30837+
resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb"
30838+
integrity sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==
30839+
dependencies:
30840+
semver "^7.5.3"
30841+
3080930842
3081030843
version "4.0.1"
3081130844
resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-4.0.1.tgz#f70000fe0e4f4ab7ceeb3703d3053f8886e0386b"
@@ -31914,7 +31947,7 @@ supports-color@^2.0.0:
3191431947
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
3191531948
integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
3191631949

31917-
supports-color@^5.3.0:
31950+
supports-color@^5.3.0, supports-color@^5.5.0:
3191831951
version "5.5.0"
3191931952
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
3192031953
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -32632,6 +32665,11 @@ totalist@^3.0.0:
3263232665
resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.0.tgz#4ef9c58c5f095255cdc3ff2a0a55091c57a3a1bd"
3263332666
integrity sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==
3263432667

32668+
touch@^3.1.0:
32669+
version "3.1.1"
32670+
resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.1.tgz#097a23d7b161476435e5c1344a95c0f75b4a5694"
32671+
integrity sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==
32672+
3263532673
tough-cookie@^4.0.0, tough-cookie@^4.1.4:
3263632674
version "4.1.4"
3263732675
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
@@ -33058,6 +33096,11 @@ unc-path-regex@^0.1.2:
3305833096
resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
3305933097
integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
3306033098

33099+
undefsafe@^2.0.5:
33100+
version "2.0.5"
33101+
resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
33102+
integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
33103+
3306133104
underscore.string@^3.2.2, underscore.string@~3.3.4:
3306233105
version "3.3.6"
3306333106
resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159"

0 commit comments

Comments
 (0)