mirror of
https://github.com/zadam/trilium.git
synced 2025-01-25 00:18:15 +08:00
fix docker build
This commit is contained in:
parent
fda219d070
commit
e9ab044e46
3 changed files with 4 additions and 3 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -7,3 +7,4 @@ yarn-error.log
|
|||
config.ini
|
||||
cert.key
|
||||
cert.crt
|
||||
server-package.json
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue