sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix docker build

pull/255/head
zadam 2019-10-15 21:53:46 +07:00
parent fda219d070
commit e9ab044e46
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
Unescape Escape View File

@ -7,3 +7,4 @@ yarn-error.log
config.ini config.ini
cert.key cert.key
cert.crt cert.crt
server-package.json

4
Dockerfile
Unescape Escape View File

@ -3,9 +3,7 @@ FROM node:12.12.0-alpine
# Create app directory # Create app directory
WORKDIR /usr/src/app WORKDIR /usr/src/app
# Copy both package.json and package-lock.json COPY server-package.json package.json
# where available (npm@5+)
COPY package.json package-lock.json ./
# Install app dependencies # Install app dependencies
RUN set -x \ RUN set -x \

2
bin/build-docker.sh
Unescape Escape View File

@ -3,6 +3,8 @@
VERSION=`jq -r ".version" package.json` VERSION=`jq -r ".version" package.json`
SERIES=${VERSION:0:4}-latest SERIES=${VERSION:0:4}-latest
cat package.json | grep -v electron > server-package.json
sudo docker build -t zadam/trilium:$VERSION -t zadam/trilium:$SERIES . sudo docker build -t zadam/trilium:$VERSION -t zadam/trilium:$SERIES .
if [[ $VERSION != *"beta"* ]]; then if [[ $VERSION != *"beta"* ]]; then