From 3e58d5cef62c0a1ed9dea7841d0e8e160b4ad927 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Fri, 27 Nov 2015 23:07:57 -0500 Subject: [PATCH 1/2] Improve fonts - Druid Mono Sans is now available --- 41-repl-os-win.conf | 388 ++++++++++++++++++++++++++++++++++++++++++++ Dockerfile | 17 ++ Inconsolata.ttf | 88 ++++++++++ netbeans.conf | 63 +++++++ 4 files changed, 556 insertions(+) create mode 100644 41-repl-os-win.conf create mode 100644 Inconsolata.ttf create mode 100644 netbeans.conf diff --git a/41-repl-os-win.conf b/41-repl-os-win.conf new file mode 100644 index 0000000..3d424b0 --- /dev/null +++ b/41-repl-os-win.conf @@ -0,0 +1,388 @@ + + + + + + + + + + true + + + Nimbus Sans + + + Arial + + + + + true + + + Nimbus Sans L + + + Arial + + + + + true + + + Helvetica Neue + + + Arial + + + + + true + + + Helvetica + + + Arial + + + + + true + + + Liberation Sans + + + Arial + + + + + true + + + Freesans + + + Arial + + + + + true + + + Nimbus Sans + + + Arial + + + + + true + + + Nimbus Sans L + + + Arial + + + + + true + + + Helvetica Neue + + + Arial + + + + + true + + + Helvetica + + + Arial + + + + + true + + + Liberation Sans + + + Arial + + + + + true + + + Freesans + + + Arial + + + + + + true + + + Bitstream Vera Sans + + + Verdana + + + + + true + + + Bitstream Vera Sans + + + Verdana + + + + + + true + + + Courier + + + Courier New + + + + + true + + + FreeMono + + + Courier New + + + + + true + + + Nimbus Mono L + + + Courier New + + + + + true + + + Courier + + + Courier New + + + + + true + + + FreeMono + + + Courier New + + + + + true + + + Nimbus Mono L + + + Courier New + + + + + + true + + + Times + + + Times New Roman + + + + + true + + + DejaVu Serif + + + Times New Roman + + + + + true + + + Nimbus Serif L + + + Times New Roman + + + + + true + + + Liberation Serif + + + Times New Roman + + + + + true + + + Times + + + Times New Roman + + + + + true + + + DejaVu Serif + + + Times New Roman + + + + + true + + + Nimbus Serif L + + + Times New Roman + + + + + true + + + Liberation Serif + + + Times New Roman + + + + + + true + + + Palatino + + + Palatino Linotype + + + + + true + + + Palatino + + + Palatino Linotype + + + + + + true + + + Lucida Sans + + + Lucida Sans Unicode + + + + + true + + + Lucida Grande + + + Lucida Sans Unicode + + + + + true + + + Lucida Sans + + + Lucida Sans Unicode + + + + + true + + + Lucida Grande + + + Lucida Sans Unicode + + + + diff --git a/Dockerfile b/Dockerfile index 9de7f5e..3bf3ee7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,24 @@ RUN chmod +x /usr/local/bin/netbeans && \ chmod 0440 /etc/sudoers.d/developer && \ chown developer:developer -R /home/developer +RUN apt-get update && \ + apt-get install -y fontconfig libfreetype6 software-properties-common && \ + add-apt-repository -y ppa:no1wantdthisname/ppa && \ + apt-get update && \ + apt-get install -y fontconfig-infinality fonts-droid && \ + rm /etc/fonts/conf.avail/52-infinality.conf && \ + ln -s /etc/fonts/infinality/infinality.conf /etc/fonts/conf.avail/52-infinality.conf && \ + /etc/fonts/infinality/infctl.sh setstyle win7 + +COPY netbeans.conf /usr/local/netbeans-8.0.1/etc/netbeans.conf +COPY 41-repl-os-win.conf /etc/fonts/infinality/conf.d/41-repl-os-win.conf + USER developer + +COPY Inconsolata.ttf /home/developer/.fonts/Inconsolata.ttf + +RUN sudo fc-cache -f -v + ENV HOME /home/developer WORKDIR /home/developer CMD /usr/local/bin/netbeans diff --git a/Inconsolata.ttf b/Inconsolata.ttf new file mode 100644 index 0000000..602a140 --- /dev/null +++ b/Inconsolata.ttf @@ -0,0 +1,88 @@ + + + + + + Page not found · GitHub Pages + + + + +
+ +

404

+

File not found

+ +

+ The site configured at this address does not + contain the requested file. +

+ +

+ If this is your site, make sure that the filename case matches the URL.
+ For root URLs (like http://example.com/) you must provide an + index.html file. +

+ +

+ Read the full documentation + for more information about using GitHub Pages. +

+ + + + + + +
+ + diff --git a/netbeans.conf b/netbeans.conf new file mode 100644 index 0000000..628f3fa --- /dev/null +++ b/netbeans.conf @@ -0,0 +1,63 @@ +# Default locations of userdir and cachedir: +# (http://wiki.netbeans.org/FaqWhatIsUserdir) +# +# On Windows ${DEFAULT_USERDIR_ROOT} will be replaced by the launcher +# with "\NetBeans" where is user's +# value of "AppData" key in Windows Registry under +# "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" +# and ${DEFAULT_CACHEDIR_ROOT} will be replaced by the launcher +# with "\NetBeans\Cache" where is user's +# value of "Local AppData" key in Windows Registry under +# "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" +# +# On Mac ${DEFAULT_USERDIR_ROOT} will be replaced by the launcher +# with "~/Library/Application Support/NetBeans" and +# ${DEFAULT_CACHEDIR_ROOT} with "~/Library/Caches/NetBeans" +# +# On other systems ${DEFAULT_USERDIR_ROOT} will be replaced by the launcher +# with "~/.netbeans" and ${DEFAULT_CACHEDIR_ROOT} with "~/.cache/netbeans" +# +# You can also use ${HOME} variable which will be replaced with +# user.home JVM system property value. This variable is valid only in +# netbeans_default_userdir and netbeans_default_cachedir properties. +# +# NOTE: If you specify a non-default userdir path on command line +# (--userdir option) and don't specify a cachedir path (--cachedir option), +# cachedir will be in "/var/cache". +# +# Cachedir must be different from userdir. The same cachedir and userdir +# would cause problems. +# +netbeans_default_userdir="${DEFAULT_USERDIR_ROOT}/8.0.1" +netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.0.1" + +# Options used by NetBeans launcher by default: +# (can be overridden by explicit command line switches) +# +# Note that default -Xmx is selected for you automatically. +# You can find these values in var/log/messages.log file in your userdir. +# The automatically selected value can be overridden by specifying -J-Xmx +# here or on the command line. +# +# If you specify the heap size explicitly, you may also want to enable +# Concurrent Mark & Sweep garbage collector. +# (see http://wiki.netbeans.org/FaqGCPauses) +# +netbeans_default_options="-J-client -J-Xss32m -J-Xms256m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true -J-Dswing.aatext=false -J-Dawt.useSystemAAFontSettings=lcd -J-Dsun.java2d.xrender=false" + +# Default location of JDK: +# (set by installer or commented out if launcher should decide) +# +# It can be overridden on command line by using --jdkhome +# Be careful when changing jdkhome. +# There are two NetBeans launchers for Windows (32-bit and 64-bit) and +# installer points to one of those in the NetBeans application shortcut +# based on the Java version selected at installation time. +# +netbeans_jdkhome="/usr/lib/jvm/java-8-oracle" + +# Additional module clusters: +# using ${path.separator} (';' on Windows or ':' on Unix): +# +#netbeans_extraclusters="/absolute/path/to/cluster1:/absolute/path/to/cluster2" + From 7bc5caf0b1594b4c0be0c99bc22cc4db38322d8e Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Sat, 28 Nov 2015 12:21:29 -0500 Subject: [PATCH 2/2] refactored dockerfile --- Dockerfile | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3bf3ee7..3eb85a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,14 @@ FROM ubuntu:14.04 MAINTAINER Fabio Rehm "fgrehm@gmail.com" RUN sed 's/main$/main universe/' -i /etc/apt/sources.list && \ - apt-get update && apt-get install -y software-properties-common && \ + apt-get update && apt-get install -y software-properties-common libxext-dev libxrender-dev libxtst-dev fontconfig libfreetype6 wget && \ add-apt-repository ppa:webupd8team/java -y && \ + add-apt-repository -y ppa:no1wantdthisname/ppa && \ apt-get update && \ + apt-get install -y fontconfig-infinality fonts-droid && \ + rm /etc/fonts/conf.avail/52-infinality.conf && \ + ln -s /etc/fonts/infinality/infinality.conf /etc/fonts/conf.avail/52-infinality.conf && \ + /etc/fonts/infinality/infctl.sh setstyle win7 && \ echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ apt-get install -y oracle-java8-installer libxext-dev libxrender-dev libxtst-dev && \ apt-get clean && \ @@ -29,24 +34,16 @@ RUN chmod +x /usr/local/bin/netbeans && \ chmod 0440 /etc/sudoers.d/developer && \ chown developer:developer -R /home/developer -RUN apt-get update && \ - apt-get install -y fontconfig libfreetype6 software-properties-common && \ - add-apt-repository -y ppa:no1wantdthisname/ppa && \ - apt-get update && \ - apt-get install -y fontconfig-infinality fonts-droid && \ - rm /etc/fonts/conf.avail/52-infinality.conf && \ - ln -s /etc/fonts/infinality/infinality.conf /etc/fonts/conf.avail/52-infinality.conf && \ - /etc/fonts/infinality/infctl.sh setstyle win7 - COPY netbeans.conf /usr/local/netbeans-8.0.1/etc/netbeans.conf COPY 41-repl-os-win.conf /etc/fonts/infinality/conf.d/41-repl-os-win.conf -USER developer +ENV JAVA_HOME /usr/lib/jvm/java-8-oracle -COPY Inconsolata.ttf /home/developer/.fonts/Inconsolata.ttf +USER developer RUN sudo fc-cache -f -v ENV HOME /home/developer + WORKDIR /home/developer CMD /usr/local/bin/netbeans