Skip to content

Commit

Permalink
Merge pull request #788 from lucyparsons/use-current-nodejs-lts
Browse files Browse the repository at this point in the history
Upgrade to latest NodeJS LTS
  • Loading branch information
r4v5 authored Aug 9, 2020
2 parents 48e62ed + da0224a commit a372f19
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions dockerfiles/web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ARG TRAVIS_PYTHON_VERSION
ARG DOCKER_BUILD_ENV
FROM python:${TRAVIS_PYTHON_VERSION:-3.5}-buster

WORKDIR /usr/src/app
Expand All @@ -7,8 +8,9 @@ ENV DEBIAN-FRONTEND noninteractive
ENV DISPLAY=:1
ENV GECKODRIVER_VERSION="v0.26.0"
RUN echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list
RUN wget -O - https://deb.nodesource.com/setup_8.x | bash -
RUN apt-get update && apt-get install -y xvfb firefox-esr libpq-dev python3-dev nodejs npm && apt-get install -y -t stretch-backports libsqlite3-0 && apt-get clean
RUN wget -O - https://deb.nodesource.com/setup_12.x | bash -
RUN apt-get update && apt-get install -y xvfb firefox-esr libpq-dev python3-dev nodejs && \
apt-get install -y -t stretch-backports libsqlite3-0 && apt-get clean

RUN wget https://github.com/mozilla/geckodriver/releases/download/${GECKODRIVER_VERSION}/geckodriver-${GECKODRIVER_VERSION}-linux64.tar.gz
RUN mkdir geckodriver
Expand All @@ -24,7 +26,6 @@ RUN chmod -R 777 /usr/src/app/ /var/lib/xkb /.cache /.yarn /.mozilla
COPY requirements.txt dev-requirements.txt /usr/src/app/
RUN pip3 install --no-cache-dir -r requirements.txt

ARG DOCKER_BUILD_ENV
RUN test "${DOCKER_BUILD_ENV}" = production || pip3 install --no-cache-dir -r dev-requirements.txt

COPY package.json /usr/src/app/
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "OpenOversight",
"name": "openoversight",
"version": "1.0.0",
"repository": "https://github.com/lucyparsons/OpenOversight",
"scripts": {
"build": "node-sass --build --recursive OpenOversight/app/static/scss/index.scss -o OpenOversight/app/static/dist",
"watch": "node-sass --watch --recursive OpenOversight/app/static/scss/index.scss -o OpenOversight/app/static/dist"
},
"devDependencies": {
"node-sass": "^4.9.0",
"node-sass": "^4.12.0",
"jquery": "1.9.1 - 3",
"popper.js": "^1.14.3"
}
Expand Down

0 comments on commit a372f19

Please sign in to comment.