manually set up docker
diff --git a/dist-setup.sh b/dist-setup.sh
index cf45d93..001d39e 100644
--- a/dist-setup.sh
+++ b/dist-setup.sh
@@ -7,7 +7,7 @@
export CURRENT_USER=distributed
export USER_HOME=/home/${CURRENT_USER}
-ECLIPSE_URL=http://download.eclipse.org/technology/epp/downloads/release/luna/R/eclipse-java-luna-R-linux-gtk-x86_64.tar.gz
+IDEA_URL=http://download.jetbrains.com/idea/ideaIC-14.0.2.tar.gz
# -------------- Setup keys -------------------
@@ -46,22 +46,6 @@
EOF
sudo docker build -t onos/tutorial-dist .
-sudo docker run --name onos-1 -d -P onos/tutorial-dist
-sudo docker run --name onos-2 -d -P onos/tutorial-dist
-sudo docker run --name onos-3 -d -P onos/tutorial-dist
-
-sudo cat > /etc/init/onos-intances.conf << EOF
-description "ONOS Intances"
-author "Ali"
-start on filesystem and started docker
-stop on runlevel [!2345]
-respawn
-script
- /usr/bin/docker start onos-1
- /usr/bin/docker start onos-2
- /usr/bin/docker start onos-3
-end script
-EOF
cd -
@@ -85,7 +69,7 @@
export ONOS_FEATURES="webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-proxyarp,onos-app-mobility"
EOF
-echo "cell docker" >> ~/.bashrc
+echo "cell docker > /dev/null 2&>1" >> ~/.bashrc
sed -i -e s/sdn/root/ onos/tools/package/debian/onos.conf
@@ -146,14 +130,14 @@
mkdir -p ${DESKTOP}
-cat > ${DESKTOP}/Eclipse << EOF
+cat > ${DESKTOP}/IntelliJ << EOF
[Desktop Entry]
Encoding=UTF-8
Type=Application
-Name=Eclipse
-Name[en_US]=Eclipse
-Icon=/opt/eclipse/icon.xpm
-Exec=/usr/bin/eclipse
+Name=IntelliJ
+Name[en_US]=IntelliJ
+Icon=/home/distributed/Applications/idea/bin/idea.png
+Exec=/home/distributed/Applications/idea/bin/idea.sh
Comment[en_US]=
EOF
@@ -164,7 +148,7 @@
Name=Mininet
Name[en_US]=Mininet
Icon=konsole
-Exec=/usr/bin/lxterminal -e 'sudo mn --custom /home/tutorial1/onos/tools/test/topos/tower.py --topo tower --controller remote --mac'
+Exec=/usr/bin/lxterminal -e '. ~/.bashrc && sudo python ~/onos/tools/test/topos/sol.py $OC1 $OC2 $OC3'
Comment[en_US]=
EOF
@@ -179,16 +163,6 @@
Comment[en_US]=
EOF
-cat > ${DESKTOP}/GUI << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=ONOS GUI
-Name[en_US]=ONOS GUI
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser http://localhost:8181/onos/ui/index.html#topo
-Comment[en_US]=
-EOF
cat > ${DESKTOP}/Wireshark << EOF
[Desktop Entry]
@@ -201,17 +175,6 @@
Comment[en_US]=
EOF
-cat > ${DESKTOP}/Reset << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Reset
-Name[en_US]=Reset
-Icon=konsole
-Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e 'sudo service onos restart'
-Comment[en_US]=
-EOF
-
# ------------- Install Other Tools -------------
sudo apt-get install -y wireshark
# Enable root-less wireshark and add mininet
@@ -227,10 +190,13 @@
sudo apt-get install -y git-review
-wget -c -N -O /tmp/eclipse.tar.gz ${ECLIPSE_URL}
-tar xzf /tmp/eclipse.tar.gz
-sudo mv eclipse /opt
-sudo ln -s /opt/eclipse/eclipse /usr/bin/eclipse
+cd ~/Applications
+
+wget -c -N -O /tmp/idea.tar.gz ${IDEA_URL}
+tar xzf /tmp/idea.tar.gz
+sudo mv idea-IC-139.659.2 idea
+
+cd -
# ------------- Zero Unused Blocks -------------
#TODO investigate zerofree