Skip to content

Commit

Permalink
Fix docker build to include git info.
Browse files Browse the repository at this point in the history
  • Loading branch information
mayfield committed Jan 6, 2019
1 parent e312120 commit 2533137
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ node_modules
components
references
dist
.git
.git/objects/**
.sass-cache
electron
builds
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ RUN apt-get update && \
RUN gem install sass
WORKDIR /usr/src
COPY . .
ENV LC_ALL=C.UTF-8
ENV LC_ALL=C.UTF-8 \
NODE_ENV=production
RUN make
EXPOSE 1080
CMD ["make", "run"]
CMD ["npm", "start"]
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
"libsignal-protocol": "github:ForstaLabs/libsignal-protocol-javascript#3f30b444d944a61930943974d8507e90eb3b45cb",
"morgan": "1.9.0",
"quill": "1.3.6",
"quill-delta-to-html": "0.10.3"
"quill-delta-to-html": "0.10.3",
"semantic-ui": "2.2.14"
},
"devDependencies": {
"electron": "2.0.0-beta.7",
"electron-packager": "12.0.1",
"eslint": "4.19.1",
"grunt-contrib-watch": "1.0.0",
"semantic-ui": "2.2.14"
"grunt-contrib-watch": "1.0.0"
}
}

0 comments on commit 2533137

Please sign in to comment.