Skip to content

Commit

Permalink
travis automatically uses yarn if the yarn lockfile is detected. tryi…
Browse files Browse the repository at this point in the history
…ng to override
  • Loading branch information
nustiueudinastea committed Mar 29, 2017
1 parent 7bc6120 commit 390c3fd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ before_install:
- sudo apt-get install -y make
- make test-image deps

install:
- npm install

env:
- GROUP=weaveworksdemos COMMIT="${TRAVIS_COMMIT}" TAG="${TRAVIS_TAG}" REPO=front-end;

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ FROM node:4-alpine
ENV NODE_ENV "production"
ENV PORT 8079
EXPOSE 8079
#RUN addgroup mygroup && adduser -D -G mygroup myuser && mkdir -p /usr/src/app && chown -R myuser /usr/src/app
RUN addgroup mygroup && adduser -D -G mygroup myuser && mkdir -p /usr/src/app && chown -R myuser /usr/src/app

# Prepare app directory
WORKDIR /usr/src/app
COPY package.json /usr/src/app/
COPY yarn.lock /usr/src/app/
#RUN chown -R myuser /usr/src/app/
RUN chown myuser /usr/src/app/yarn.lock

#USER myuser
USER myuser
RUN yarn install

COPY . /usr/src/app
Expand Down

0 comments on commit 390c3fd

Please sign in to comment.