-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from TheGuyDanish/master
Use Chromium and reduce Java 7 security, aligned with ARM
- Loading branch information
Showing
2 changed files
with
5 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,11 +2,10 @@ FROM ubuntu:14.04 | |
MAINTAINER Kyle Anderson <[email protected]> | ||
|
||
ENV DEBIAN_FRONTEND noninteractive | ||
RUN apt-get -y install software-properties-common | ||
RUN add-apt-repository ppa:jonathonf/firefox-esr | ||
RUN apt-get update && apt-get -y install xvfb x11vnc wget \ | ||
supervisor fluxbox icedtea-7-plugin net-tools \ | ||
python-numpy firefox-esr=52.9.0esr-1~14.04.york0 | ||
supervisor fluxbox icedtea-7-plugin net-tools python-numpy \ | ||
chromium-browser | ||
RUN sed -e '/^jdk.jar.disabledAlgorithms/s/^/#/' -i /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/security/java.security | ||
ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf | ||
|
||
WORKDIR /root/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22618ea
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a heads up, switching to Chromium has broken this on HP ILO100 cards. Still works fine with the previous build though.
22618ea
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm. Please make a PR for whatever you need.
We don't have to start up every browser, but we could still include firefox?
22618ea
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lmacka Just opened #9 for this. If you could post any relevant info over there for me, that'd be great!