From f0ab1fb5a1c45bf15eae46a72b46ebf132eee531 Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 13 Jun 2022 23:17:59 +0200 Subject: [PATCH 1/2] Merge pull request #2917 from bill88t/master Added the USER_UID & USER_GID env variables --- Dockerfile | 2 +- start-docker.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7be0d0a39..1c94e8c6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN set -x \ && apk del .build-dependencies # Some setup tools need to be kept -RUN apk add --no-cache su-exec +RUN apk add --no-cache su-exec shadow # Bundle app source COPY . . diff --git a/start-docker.sh b/start-docker.sh index e214560ea..dd27c5cb9 100755 --- a/start-docker.sh +++ b/start-docker.sh @@ -1,4 +1,7 @@ #!/bin/sh +[[ ! -z "${USER_UID}" ]] && usermod -u ${USER_UID} node || echo "No USER_UID specified, leaving 1000" +[[ ! -z "${USER_GID}" ]] && groupmod -g ${USER_GID} node || echo "No USER_GID specified, leaving 1000" + chown -R node:node /home/node su-exec node node ./src/www From fac9fef652b2627067af9cd666ae011ec245c037 Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 13 Jun 2022 23:41:52 +0200 Subject: [PATCH 2/2] release 0.52.3 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 45824650a..f900ade82 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.52.2", + "version": "0.52.3", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 8006241a8..17f3b8208 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2022-06-09T23:39:48+02:00", buildRevision: "96c4934c00703a93e4887af1bab20d953823c8ed" }; +module.exports = { buildDate:"2022-06-13T23:41:52+02:00", buildRevision: "f0ab1fb5a1c45bf15eae46a72b46ebf132eee531" };