From e9ab044e462f0e7f6d5398f7e515ce84fdf8c46d Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Tue, 15 Oct 2019 21:53:46 +0200
Subject: [PATCH] fix docker build

---
 .gitignore          | 1 +
 Dockerfile          | 4 +---
 bin/build-docker.sh | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a58d0910e..746a4696a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ yarn-error.log
 config.ini
 cert.key
 cert.crt
+server-package.json
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index aa4a40d27..3d0540d8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,7 @@ FROM node:12.12.0-alpine
 # Create app directory
 WORKDIR /usr/src/app
 
-# Copy both package.json and package-lock.json
-# where available (npm@5+)
-COPY package.json package-lock.json ./
+COPY server-package.json package.json
 
 # Install app dependencies
 RUN set -x \
diff --git a/bin/build-docker.sh b/bin/build-docker.sh
index fff750404..69b705c1b 100755
--- a/bin/build-docker.sh
+++ b/bin/build-docker.sh
@@ -3,6 +3,8 @@
 VERSION=`jq -r ".version" package.json`
 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 .
 
 if [[ $VERSION != *"beta"* ]]; then