From b557a44f34531c91e3735c65d6d606e23aeb0acb Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 2 Jun 2021 21:44:19 +0200 Subject: [PATCH 1/2] release 0.47.4 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a1ce08d82..fccdc7cb0 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.47.3", + "version": "0.47.4", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 66897a31a..9e5c7ea6d 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2021-05-15T23:05:20+02:00", buildRevision: "f6dd1110e842a8b84f2bbdaadad315763045c152" }; +module.exports = { buildDate:"2021-06-02T21:44:19+02:00", buildRevision: "f50bb2278caaea077b2273356808c173e8548ded" }; From 1a615398aab8cc97f1346e1a46e0dcaab5c2557a Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 2 Jun 2021 23:37:55 +0200 Subject: [PATCH 2/2] docker now uses node 14.17 as other builds --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3e1f3618c..8552e3404 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.19.0-alpine +FROM node:14.17.0-alpine # Create app directory WORKDIR /usr/src/app