Skip to content

Commit

Permalink
Merge pull request #111 from nighca/master
Browse files Browse the repository at this point in the history
修复 docker build 的问题
  • Loading branch information
nighca authored Sep 18, 2019
2 parents e5c2e77 + 0ccf633 commit 1b61313
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
10 changes: 1 addition & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@ LABEL maintainer="nighca@live.cn"

WORKDIR /fec

# provide both npm 5.x & yarn for user

# prepare for npm upgrade https://github.com/npm/npm/issues/9863
RUN cd $(npm root -g)/npm \
&& npm install fs-extra \
&& sed -i -e s/graceful-fs/fs-extra/ -e s/fs\.rename/fs.move/ ./lib/utils/rename.js
# upgrade npm
RUN npm install -g npm@5.4.2

# provide yarn for user
RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \
echo "deb http://deb.debian.org/debian/ jessie main" >/etc/apt/sources.list && \
echo "deb-src http://deb.debian.org/debian/ jessie main" >>/etc/apt/sources.list && \
Expand Down
2 changes: 1 addition & 1 deletion npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fec-builder",
"version": "1.14.1",
"version": "1.14.2",
"bin": {
"fec-builder": "./bin/fec-builder"
},
Expand Down

0 comments on commit 1b61313

Please sign in to comment.