Skip to content

Commit

Permalink
Closes #113. Changed bcrypt-nodejs to bcrypt.
Browse files Browse the repository at this point in the history
  • Loading branch information
Aleserche committed Apr 2, 2018
1 parent 70b9658 commit 546ee1d
Show file tree
Hide file tree
Showing 8 changed files with 313 additions and 1,029 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ script:
- docker-compose build
- docker-compose up -d
- docker-compose exec ico npm i
- docker-compose exec ico npm rebuild bcrypt --build-from-source
- docker-compose exec ico npm test
- export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "production"; elif [
"$TRAVIS_BRANCH" == "develop" ]; then echo "stage"; else echo "dev-$(git rev-parse
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mhart/alpine-node:8.9.1

RUN apk update && apk upgrade && apk add git && apk add python && apk add make && apk add g++
RUN apk update && apk upgrade && apk add git && apk add make && apk add g++ && apk --no-cache add --virtual builds-deps build-base python
VOLUME /usr/src/app
EXPOSE 3000
EXPOSE 4000
Expand Down
Loading

0 comments on commit 546ee1d

Please sign in to comment.