Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use yarn.lock when building the apps #5897

Merged
merged 2 commits into from
Sep 10, 2018
Merged

use yarn.lock when building the apps #5897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50758e0
Use yarn install --pure-lockfile
willdurand Aug 9, 2018
9f14a30
Use lockfile in Dockerfile
willdurand Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ cache:
# Allow to display job names on Travis-CI, see:
# https://github.com/travis-ci/travis-ci/issues/5898#issuecomment-362490313
script: FORCE_COLOR=0 yarn $COMMAND

# See: https://github.com/mozilla/addons-frontend/issues/3034
install: yarn install --pure-lockfile

jobs:
include:
# Test the build process.
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ FROM node:6-slim

# Install node_modules into a different directory to avoid npm/npm#9863.
RUN mkdir -p /srv/node
ADD package.json /srv/node/
COPY package.json /srv/node/
COPY yarn.lock /srv/node/
WORKDIR /srv/node

# This file has been downloaded from: https://dl.yarnpkg.com/debian/pubkey.gpg
Expand All @@ -23,12 +24,12 @@ RUN buildDeps=' \
# install deps
apt-get update -y && \
apt-get install -y --no-install-recommends $buildDeps && \
yarn install && \
yarn install --pure-lockfile && \
# cleanup
# apt-get purge -y $buildDeps && \
rm -rf /var/lib/apt/lists/*

ADD . /srv/code/
COPY . /srv/code/
WORKDIR /srv/code

# The V2 Pipeline expects version.json to be located in /app/
Expand Down