93 Commits

Author SHA1 Message Date
Panagiotis Papadopoulos
fa0358662a build(docker): add missing cleanupNodeModules removal to Dockerfile
previously forgot to add this here as well -> had it only in the Dockerfile.alpine
2025-03-27 09:06:09 +01:00
Panagiotis Papadopoulos
e9fa37c4ee chore(docker): remove TODO 2025-03-27 09:04:10 +01:00
Panagiotis Papadopoulos
75431ca634 build: make running of npm ci in build scripts configurable
* moved the running of npm ci from copy-dist to cleanupNodeModules
* added flag to disable it (necessary for electron-forge)
2025-03-27 00:00:41 +01:00
Panagiotis Papadopoulos
1ceaafa1e8 build: move cleanupNodeModules to its own file
this is necessary, since for Docker and electron-forge, we need to run this as an extra step after copy-dist

for electron-forge: after it is done with its own "pruning", as we otherwise would need to also take care of certain electron related pruning

for Docker: as a last step in the build stage
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
607f9096aa build: output into "build" folder again → "dist" will be used for the final output in archive form
this will allow for cleaner separation -> build for the output from the build stage (i.e. TS/Webpack + asset copying) and dist for the archive format of the build folder
2025-03-09 18:59:54 +01:00
Panagiotis Papadopoulos
70e227f4c3 build(Docker): improve image size, by deleting node-compile-cache 2025-03-07 23:14:56 +01:00
Panagiotis Papadopoulos
907b8c503e build: copy package-lock.json into dist folder as well 2025-03-07 23:14:56 +01:00
Panagiotis Papadopoulos
38690053a8 build(Docker): improve image size, by deleting unnecessary node_modules fodler from dist folder
added a TODO as well, to get rid of this strange step here at some point
2025-03-07 23:14:56 +01:00
Panagiotis Papadopoulos
68875683af build(Docker): get rid of apparently unused packages at build stage 2025-03-07 23:14:56 +01:00
Panagiotis Papadopoulos
c68b0b02e4 build(Docker): simplify Docker build and runtime stage
this Dockerfile is aimed at production builds, i.e. trying to keep size as small as possible at the cost of "rebuild speed", due to missed docker cache opportunities.

Build Stage:
* do the complete build inside docker as oposed to the previous "hybrid", where tsc was run locally and the output got copied into the Docker build stage → you can now build this with Docker, without having to install the whole node/TS env locally

* build into a "build" subfolder, for easier clean up during build stage

* get rid of now unnecessary extra file/asset handling, as this is now handled by `npm run build:prepare-dist`

* no `npm prune` needed here, as we delete the whole build folder anyways in the last build step

Runtime stage:
* move the "electron" dep removal from the builder stage to the runtime stage, before installing the dependencies

* move to `npm ci` for reproducible installations – but only installing runtime deps here

* get rid of now unnecessary copying commands from the builder stage, as everything is now neatly available in "/usr/src/app"
2025-03-07 23:14:56 +01:00
Panagiotis Papadopoulos
2973d38db0 build(Docker): move server-package.json preparation into Dockerfile 2025-03-07 23:14:56 +01:00
Panagiotis Papadopoulos
bb7a4f9bc3 build(Docker): comment out seemingly useless installation of build dependencies 2025-03-07 23:14:56 +01:00
Panagiotis Papadopoulos
11a9dfd693 Merge branch 'develop' into chore_npm-scripts-namescape 2025-02-15 09:02:23 +01:00
Panagiotis Papadopoulos
9cddb1deac chore(scripts): namespace "build:webpack" 2025-02-14 08:41:34 +01:00
renovate[bot]
3d320308c9
chore(deps): update node.js to v22.14.0 2025-02-14 02:12:50 +00:00
Panagiotis Papadopoulos
ad02b86719 chore: remove now unnecessary manual copying of share.js
this is now correctly handled by the webpack build
2025-01-26 21:39:34 +01:00
renovate[bot]
a313b96ff8
chore(deps): update node.js to v22.13.1 2025-01-23 20:17:47 +00:00
Elian Doran
b2ca87d7e8
fix(docker): not running due to missing file 2025-01-11 17:59:41 +02:00
renovate[bot]
b1edafb092
chore(deps): update node.js to v22.13.0 2025-01-10 01:54:01 +00:00
renovate[bot]
43f6bbc8f9
chore(deps): update node.js to v22 2024-12-09 07:53:03 +00:00
renovate[bot]
8453255ed3
chore(deps): update node.js to v20.18.1 2024-11-21 21:51:18 +00:00
perf3ct
0859a955b1 Results in a much smaller container 2024-11-04 17:38:05 -08:00
Jin
690bd4ce5f fix ci errors 2024-08-10 11:39:05 +02:00
perf3ct
676bff43d9
fix arm builds 2024-08-08 14:38:39 -07:00
Elian Doran
f4e7dcd5e8
docker: Fix healthcheck & convert to TypeScript (closes #296) 2024-08-07 23:25:22 +03:00
Elian Doran
a7006df892
docker: Update to Node 20.15.1 2024-07-16 23:52:55 +03:00
Elian Doran
e6ff99198f
ci: Fix docker build after macOS integration 2024-07-13 22:10:57 +03:00
Elian Doran
7fd63e8064
docker: Remove unneeded build directory 2024-07-13 11:45:20 +03:00
Elian Doran
d18bfb9d69
docker: Fix build by generating artifacts 2024-07-13 11:40:52 +03:00
Elian Doran
9b88228be9
docker: Cache system dependencies installation 2024-07-13 11:14:32 +03:00
zadam
2132cf3bdc nodejs 18.18.2 2023-10-18 09:40:00 +02:00
zadam
62ecd1ad76 node 18.18.0 2023-09-21 12:29:11 +02:00
zadam
b61aab06b5 nodejs upgrade 2023-07-15 10:32:26 +02:00
zadam
c0cf319521 upgrade electron to 25 and node to 18 2023-05-04 21:01:25 +02:00
holo
e6803e9a9b “Docker non-root healthcheck” 2023-03-15 00:01:25 +00:00
zadam
7d0117bd28 unneeded changes from dev 2023-02-17 16:24:47 +01:00
zadam
4558e349b5 node update 2023-02-17 15:05:27 +01:00
zadam
6f7b554cdc preparing 0.59 without ocr/pdf, userguide, note ancillaries 2023-02-17 14:49:45 +01:00
zadam
78d61f157e fix docker healthcheck 2023-02-10 12:20:27 +01:00
zadam
3c0ba09a62 fix docker build 2023-02-10 11:40:56 +01:00
zadam
e57d325bd6 fix docker build 2023-02-10 11:24:31 +01:00
zadam
260bc93a66 reimplement docker healtcheck into node.js to take into account configuration, #3582 2023-02-10 11:09:56 +01:00
zadam
a9296e2a39 update node.js to 18 2023-02-10 10:44:38 +01:00
zadam
7c98ade72b fix missing doc resources for launchers, closes #3455 2022-12-25 11:58:24 +01:00
DynamoFox
f45478260e Fix missing share.js in public/app-dist folder; Delete unused public/app folder (Docker build) 2022-12-12 21:39:10 +01:00
DynamoFox
851465da62 Fix missing webpack bundle generation in Docker container build 2022-12-02 18:15:03 +01:00
zadam
a76bef1a28 docker should use webpacked frontend files, fixes #3322 2022-11-21 21:15:04 +01:00
zadam
b499640db8 use trilium version number in asset paths to avoid caching issues WIP 2022-10-26 23:50:54 +02:00
Bill Sideris
57609a5952 Add docker health check 2022-06-18 17:10:26 +03:00
Bill Sideris
8a43688a65 Added the USER_UID & USER_GID env variables 2022-06-13 12:43:10 +03:00