Skip to content

Commit

Permalink
Merge pull request #1983 from DefectDojo/1.5.4.1
Browse files Browse the repository at this point in the history
Backport nodejs fix
  • Loading branch information
devGregA authored Mar 5, 2020
2 parents 7f0dfc1 + e73f033 commit c46688c
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Dockerfile.nginx
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,22 @@ RUN pip3 wheel --wheel-dir=/tmp/wheels -r ./requirements.txt
FROM build AS collectstatic

USER root
ENV \
# This will point yarn to whatever version of node you decide to use
# due to the use of nodejs instead of node name in some distros
node="nodejs"
RUN \
apt-get -y update && \
apt-get -y install apt-transport-https ca-certificates && \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_11.x stretch main" | tee /etc/apt/sources.list.d/nodesource.list && \
curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
echo "deb https://nightly.yarnpkg.com/debian/ nightly main" | tee /etc/apt/sources.list.d/yarn.list && \
apt-get -y update && \
apt-get -y install nodejs && \
echo "$(node --version)" && \
apt-get -y install --no-install-recommends yarn && \
echo "$(yarn --version)" && \
apt-get clean && \
rm -rf /var/lib/apt/lists && \
true
Expand Down

0 comments on commit c46688c

Please sign in to comment.