Skip to content

Commit e814357

Browse files
committed
Using Xpra and updated to netbeans 8.1
1 parent 7fc5272 commit e814357

3 files changed

Lines changed: 31 additions & 41 deletions

File tree

Dockerfile

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM ubuntu:14.04
2-
# MAINTAINER Fabio Rehm "fgrehm@gmail.com" modified by Reto Gmür
1+
FROM reto/x11-xpra
2+
MAINTAINER Reto Gmür "me@farewellutopia.com"
3+
# based on docker-netbeans by Fabio Rehm "fgrehm@gmail.com"
34

45
# Set the locale
56
RUN locale-gen en_US.UTF-8
@@ -20,15 +21,16 @@ RUN sed 's/main$/main universe/' -i /etc/apt/sources.list && \
2021
apt-get install -y oracle-java8-installer libxext-dev libxrender-dev libxtst-dev nodejs npm chromium-browser && \
2122
apt-get clean && \
2223
rm -rf /var/lib/apt/lists/* && \
23-
rm -rf /tmp/* && \
2424
ln -s /usr/bin/nodejs /usr/bin/node
2525

26+
# rm -rf /tmp/* && \
27+
2628
RUN npm install -g browserify
2729
RUN echo chromium-browser --no-sandbox > /usr/local/bin/chromium
2830

2931
ADD state.xml /tmp/state.xml
3032

31-
RUN wget http://dlc-cdn.sun.com/netbeans/8.0.2/final/bundles/netbeans-8.0.2-javaee-linux.sh -O /tmp/netbeans.sh -q && \
33+
RUN wget http://download.netbeans.org/netbeans/8.1/final/bundles/netbeans-8.1-javaee-linux.sh -O /tmp/netbeans.sh -q && \
3234
chmod +x /tmp/netbeans.sh && \
3335
echo 'Installing netbeans' && \
3436
/tmp/netbeans.sh --silent --state /tmp/state.xml && \
@@ -38,12 +40,8 @@ RUN wget http://dlc-cdn.sun.com/netbeans/8.0.2/final/bundles/netbeans-8.0.2-java
3840
ADD run /usr/local/bin/netbeans
3941

4042
RUN chmod +rx /usr/local/bin/netbeans && \
41-
mkdir -p /home/developer && \
42-
echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \
43-
echo "developer:x:1000:" >> /etc/group && \
44-
echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \
45-
chmod 0440 /etc/sudoers.d/developer && \
46-
chown developer:developer -R /home/developer
43+
echo "user ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/user && \
44+
chmod 0440 /etc/sudoers.d/user
4745

4846
ADD tilda-config /home/template/.config/tilda/config_0
4947

@@ -52,9 +50,3 @@ RUN echo "Adding start script"
5250
ADD start.sh /usr/local/bin/start.sh
5351

5452
RUN chmod +rx /usr/local/bin/start.sh
55-
56-
USER developer
57-
58-
ENV HOME /home/developer
59-
WORKDIR /home/developer
60-
CMD /usr/local/bin/start.sh

run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
exec /usr/local/netbeans-8.0.2/bin/netbeans "$@"
3+
exec /usr/local/netbeans/bin/netbeans "$@"

state.xml

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,55 +37,53 @@
3737
holder.
3838
--><state xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="state-file.xsd">
3939
<components>
40-
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="nb-base" version="8.0.2.0.201411181905">
40+
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="nb-base" version="8.1.0.0.201510222201">
4141
<properties>
42-
<property name="installation.location.windows">$N{install}/NetBeans 8.0.2</property>
42+
<property name="installation.location.windows">$N{install}/NetBeans 8.1</property>
4343
<property name="minimum.jdk.version">1.7.0</property>
44-
<property name="jdk.location">/usr/lib/jvm/java-8-oracle</property>
45-
<property name="installation.timestamp">1418313731326</property>
44+
<property name="jdk.location">/usr/lib/jvm/java-8-oracle/</property>
45+
<property name="installation.timestamp">1451222036943</property>
4646
<property name="start.menu.shortcut.location">all.users</property>
47-
<property name="installation.location.macosx">$N{install}/NetBeans/NetBeans/NetBeans 8.0.2.app</property>
48-
<property name="installation.location">/usr/local/netbeans-8.0.2</property>
47+
<property name="installation.location.macosx">$N{install}/NetBeans/NetBeans 8.1.app</property>
48+
<property name="installation.location">/usr/local/netbeans</property>
4949
<property name="desktop.shortcut.location">all.users</property>
50-
<property name="netbeans.summary.message.text">JUnit library successfully installed and all plugins are up to date.
51-
52-
</property>
50+
<property name="netbeans.summary.message.text"/>
5351
</properties>
5452
</product>
55-
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="nb-extide" version="8.0.2.0.201411181905">
53+
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="nb-extide" version="8.1.0.0.201510222201">
5654
<properties>
5755
<property name="show-in-wizard">false</property>
58-
<property name="installation.location">/usr/local/netbeans-8.0.2</property>
56+
<property name="installation.location">/usr/local/netbeans</property>
5957
</properties>
6058
</product>
61-
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="nb-javase" version="8.0.2.0.201411181905">
59+
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="nb-javase" version="8.1.0.0.201510222201">
6260
<properties>
6361
<property name="jre.allowed">false</property>
64-
<property name="installation.location">/usr/local/netbeans-8.0.2</property>
65-
<property name="junit.accepted">true</property>
62+
<property name="installation.location">/usr/local/netbeans</property>
6663
</properties>
6764
</product>
68-
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="nb-javaee" version="8.0.2.0.201411181905">
65+
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="nb-javaee" version="8.1.0.0.201510222201">
6966
<properties>
70-
<property name="installation.location">/usr/local/netbeans-8.0.2</property>
67+
<property name="installation.location">/usr/local/netbeans</property>
7168
</properties>
7269
</product>
73-
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="nb-webcommon" version="8.0.2.0.201411181905">
70+
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="nb-webcommon" version="8.1.0.0.201510222201">
7471
<properties>
75-
<property name="installation.location">/usr/local/netbeans-8.0.2</property>
72+
<property name="installation.location">/usr/local/netbeans</property>
7673
</properties>
7774
</product>
78-
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="glassfish-mod" version="4.1.0.13.0">
75+
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-installed" uid="glassfish-mod" version="4.1.1.0.1">
7976
<properties>
8077
<property name="jdk.location"/>
81-
<property name="installation.location">/usr/local/glassfish-4.1</property>
78+
<property name="installation.location">/usr/local/glassfish-4.1.1</property>
8279
</properties>
8380
</product>
84-
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-uninstalled" uid="tomcat" version="8.0.15.0.0">
81+
<product platform="windows linux solaris-sparc solaris-x86 macosx-ppc macosx-x86" status="to-be-uninstalled" uid="tomcat" version="8.0.27.0.0">
8582
<properties>
86-
<property name="installation.location">$N{install}/apache-tomcat-8.0.15</property>
87-
<property name="installation.location.windows">$E{ProgramFiles}/Apache Software Foundation/Apache Tomcat 8.0.15</property>
83+
<property name="installation.location">$N{install}/apache-tomcat-8.0.27</property>
84+
<property name="installation.location.windows">$E{ProgramFiles}/Apache Software Foundation/Apache Tomcat 8.0.27</property>
8885
</properties>
8986
</product>
9087
</components>
91-
</state>
88+
</state>
89+

0 commit comments

Comments
 (0)