From 945fd596d250eb4f49feb2158edeec80bf3e9318 Mon Sep 17 00:00:00 2001
From: AJ NOURI <AJNOURI@users.noreply.github.com>
Date: Thu, 20 Jul 2017 20:11:13 +0200
Subject: [PATCH 1/2] Update Dockerfile

---
 docker/ipterm/web/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/ipterm/web/Dockerfile b/docker/ipterm/web/Dockerfile
index c2cb7f5..badab90 100644
--- a/docker/ipterm/web/Dockerfile
+++ b/docker/ipterm/web/Dockerfile
@@ -12,7 +12,7 @@ RUN set -ex \
 # install web tools
 #
     && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-        firefox-esr lxterminal jwm menu leafpad \
+        firefox-esr lxterminal jwm menu leafpad apache2-utils \
     && rm -rf /var/lib/apt/lists/* \
     && /bin/echo -e '\
 \x23!/bin/sh\n\

From d12e2058f2cb12584536cb700e0a426d1805d170 Mon Sep 17 00:00:00 2001
From: ajnouri <ajn.bin@gmail.com>
Date: Thu, 20 Jul 2017 20:15:51 +0200
Subject: [PATCH 2/2] remove duplicate webterm and modify the old one

---
 docker/webterm/Dockerfile | 60 ---------------------------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 docker/webterm/Dockerfile

diff --git a/docker/webterm/Dockerfile b/docker/webterm/Dockerfile
deleted file mode 100644
index badab90..0000000
--- a/docker/webterm/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# docker image with basic networking tools and web browser
-
-FROM gns3/ipterm-base
-
-# minimal init, see https://github.com/Yelp/dumb-init
-ADD https://github.com/Yelp/dumb-init/releases/download/v1.1.1/dumb-init_1.1.1_amd64 /usr/local/sbin/dumb-init
-
-RUN set -ex \
-    && chmod 755 /usr/local/sbin/dumb-init \
-    && apt-get update \
-#
-# install web tools
-#
-    && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-        firefox-esr lxterminal jwm menu leafpad apache2-utils \
-    && rm -rf /var/lib/apt/lists/* \
-    && /bin/echo -e '\
-\x23!/bin/sh\n\
-\n\
-\x23 use home page on first start\n\
-[ -e "$HOME/.mozilla" ] || start_url="about:home"\n\
-\n\
-\x23 start firefox\n\
-start=$(date +%s)\n\
-firefox $start_url\n\
-status=$?\n\
-\n\
-\x23 workaround: restart firefox, if it crashes during initialization\n\
-if [ $status -eq 139 -a $(($(date +%s)-start)) -le 10 ]; then\n\
-	firefox $start_url\n\
-fi' \
-        > /usr/local/bin/start-firefox && chmod +x /usr/local/bin/start-firefox \
-    && /bin/echo -e '\
-?package(firefox-esr):\\\n\
- needs="x11"\\\n\
- section="Applications"\\\n\
- title="Mozilla Firefox"\\\n\
- command="start-firefox"' \
-        > /etc/menu/firefox \
-    && echo "postrun="\""sed -i '/^    </ d' debian-menu"\" >> /etc/menu-methods/jwm \
-    && sed -i 's/\(Desktops width\)="[0-9]*"/\1="2"/' /etc/jwm/system.jwmrc \
-    && update-menus \
-    && mkdir -p /root/.config/lxterminal \
-    && /bin/echo -e '\
-[general]\n\
-scrollback=1000\n\
-fgcolor=#ffffff' \
-        > /root/.config/lxterminal/lxterminal.conf \
-    && /bin/echo -e '\
-\x23!/bin/sh\n\
-[ $$ -eq 1 ] && exec dumb-init "$0" "$@"\n\
-\n\
-cd\n\
-export SHELL=/bin/bash\n\
-start-firefox &\n\
-jwm' \
-        > /etc/init.sh && chmod +x /etc/init.sh
-
-VOLUME [ "/root" ]
-CMD [ "/etc/init.sh" ]