Skip to content

Commit

Permalink
Merge pull request #12353 from trop-bot/2-0-x-bp-update-ci-to-use-nod…
Browse files Browse the repository at this point in the history
…e.js-8-1521472101213

Backport (2-0-x) - Update CI to use Node.js 8
  • Loading branch information
John Kleinschmidt committed Mar 19, 2018
2 parents 0cc4584 + c800219 commit bd25a5f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions Dockerfile.armv7
Expand Up @@ -29,13 +29,8 @@ RUN apt-get update && apt-get install -y\
wget \
xvfb

# Install node.js
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
RUN apt-get update && apt-get install -y nodejs

ADD tools/xvfb-init.sh /etc/init.d/xvfb
RUN chmod a+x /etc/init.d/xvfb
ADD tools/run-electron.sh /run-electron.sh
RUN chmod a+x /run-electron.sh

CMD sh /run-electron.sh
2 changes: 1 addition & 1 deletion Jenkinsfile.arm64
@@ -1,7 +1,7 @@
pipeline {
agent {
docker {
image 'electronbuilds/arm64v8:0.0.1'
image 'electronbuilds/arm64v8:0.0.2'
args '--privileged'
}
}
Expand Down

0 comments on commit bd25a5f

Please sign in to comment.