update build scripts

This commit is contained in:
Henry Oswald 2018-03-07 11:23:52 +00:00
parent 43b1fe4b68
commit c80c38b7a9
3 changed files with 7 additions and 6 deletions

View file

@ -4,6 +4,8 @@ COPY ./ /app
WORKDIR /app
RUN rm -rf node_modules/* && make clean
RUN npm install
@ -20,8 +22,7 @@ WORKDIR /app
# The app will run as the 'app' user, and so not have write permissions
# on any files it doesn't need.
RUN useradd --user-group --create-home --home-dir /app --shell /bin/false app
RUN [ -e ./install_deps.sh ] && ./install_deps.sh
RUN ./install_deps.sh
ENTRYPOINT ["/bin/sh", "entrypoint.sh"]
CMD ["node","app.js"]

View file

@ -8,7 +8,7 @@ version: "2"
services:
test_unit:
image: quay.io/sharelatex/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
entrypoint: npm run test:unit:_run
command: npm run test:unit:_run
test_acceptance:
build: .
@ -22,7 +22,7 @@ services:
depends_on:
- redis
- mongo
entrypoint: npm run test:acceptance:_run
command: npm run test:acceptance:_run
redis:
image: redis

View file

@ -11,7 +11,7 @@ services:
volumes:
- .:/app
working_dir: /app
entrypoint: npm run test:unit
command: npm run test:unit
test_acceptance:
build: .
@ -27,7 +27,7 @@ services:
depends_on:
- redis
- mongo
entrypoint: npm run test:acceptance
command: npm run test:acceptance
redis:
image: redis