gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

unneeded changes from dev

Browse Source
This commit is contained in:
zadam 2023-02-17 16:24:47 +01:00
parent 956682f2c7
commit 7d0117bd28
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -21,16 +21,6 @@ RUN set -x \
nasm \ nasm \
libpng-dev \ libpng-dev \
python3 \ python3 \
build-base \
cairo-dev \
jpeg-dev \
pango-dev \
musl-dev \
giflib-dev \
pixman-dev \
pangomm-dev \
libjpeg-turbo-dev \
freetype-dev \
&& npm install \ && npm install \
&& apk del .build-dependencies \ && apk del .build-dependencies \
&& npm run webpack \ && npm run webpack \
@ -39,8 +29,8 @@ RUN set -x \
&& cp -r src/public/app/doc_notes src/public/app-dist/. \ && cp -r src/public/app/doc_notes src/public/app-dist/. \
&& rm -rf src/public/app && rm -rf src/public/app
# Some tools need to be kept # Some setup tools need to be kept
RUN apk add --no-cache su-exec shadow pango libjpeg giflib RUN apk add --no-cache su-exec shadow
# Add application user and setup proper volume permissions # Add application user and setup proper volume permissions
RUN adduser -s /bin/false node; exit 0 RUN adduser -s /bin/false node; exit 0

2
src/public/app/entities/fattribute.js
View File

@ -42,7 +42,7 @@ class FAttribute {
get targetNoteId() { // alias get targetNoteId() { // alias
if (this.type !== 'relation') { if (this.type !== 'relation') {
throw new Error(`FAttribute ${this.attributeId} is not a relation`); throw new Error(`Attribute ${this.attributeId} is not a relation`);
} }
return this.value; return this.value;