From f85d883fbe6e75ec0c557b8899e649189938e852 Mon Sep 17 00:00:00 2001
From: Paolo Cozzi <paolo.cozzi@ptp.it>
Date: Thu, 22 Jun 2017 12:23:10 +0200
Subject: [PATCH] Added X11 firefox-esr with icedtea plugin

---
 X11/firefox-jdk/.gitignore |  8 ++++++++
 X11/firefox-jdk/Dockerfile | 37 +++++++++++++++++++++++++++++++++++++
 X11/firefox-jdk/README.md  | 18 ++++++++++++++++++
 compose/gitlab/README.md   |  8 +++++---
 4 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 X11/firefox-jdk/.gitignore
 create mode 100644 X11/firefox-jdk/Dockerfile
 create mode 100644 X11/firefox-jdk/README.md

diff --git a/X11/firefox-jdk/.gitignore b/X11/firefox-jdk/.gitignore
new file mode 100644
index 0000000..6cb9ed9
--- /dev/null
+++ b/X11/firefox-jdk/.gitignore
@@ -0,0 +1,8 @@
+.cache/
+.mozilla/
+Desktop/
+.bash_history
+.java/
+.ssh/
+Downloads/
+.config/
diff --git a/X11/firefox-jdk/Dockerfile b/X11/firefox-jdk/Dockerfile
new file mode 100644
index 0000000..e8314a1
--- /dev/null
+++ b/X11/firefox-jdk/Dockerfile
@@ -0,0 +1,37 @@
+#
+# VERSION 0.1
+# DOCKER-VERSION  17.05.0-ce
+# AUTHOR:         Paolo Cozzi <paolo.cozzi@ptp.it>
+# DESCRIPTION:    A openjdk-7 image with firefox installed
+# TO_BUILD:       docker build --rm -t ptp/firefox-jdk .
+# TO_VOLUME:      docker create -v $PWD:/home/firefox --name firefox-jdk_volume ptp/firefox-jdk /bin/true
+# TO_RUN:         docker run -ti -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$DISPLAY --volumes-from firefox-jdk_volume --name firefox-jdk ptp/firefox-jdk
+# TO_TAG:         docker tag ptp/firefox-jdk:latest ptp/firefox-jdk:0.1
+#
+
+FROM openjdk:7-jdk
+
+MAINTAINER Paolo Cozzi <paolo.cozzi@ptp.it>
+
+# install firefox, then clean packages
+RUN apt-get update && apt-get install -y \
+    firefox-esr=45.9.0esr-1~deb8u1 \
+    icedtea-7-plugin && \
+    apt-get clean && \
+    apt-get autoclean && \
+    rm -rf /tmp/* /var/tmp/*
+
+# Add a new user
+RUN useradd -m firefox
+
+# Setting useful environment variables
+WORKDIR /home/firefox/
+
+# Set home directory as VOLUME
+VOLUME /home/firefox
+
+# Setting the user
+USER firefox
+
+# default command to reattach istance
+CMD ["/usr/bin/firefox", "--no-remote"]
diff --git a/X11/firefox-jdk/README.md b/X11/firefox-jdk/README.md
new file mode 100644
index 0000000..239cebe
--- /dev/null
+++ b/X11/firefox-jdk/README.md
@@ -0,0 +1,18 @@
+
+Firefox-esr image with icedtea-7 plugin
+=======================================
+
+This image enable icedtea-7 java plugin on Firefox-esr (on a host using X11).
+First create a volume in order to store browser configuration, caches, etc.
+
+```
+$ docker create -v $PWD:/home/firefox --name firefox-jdk_volume ptp/firefox-jdk /bin/true
+```
+
+Then start firefox image sharing volume and host `$DISPLAY`:
+
+```
+$ docker run -ti -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$DISPLAY --volumes-from firefox-jdk_volume --name firefox-jdk ptp/firefox-jdk
+```
+
+Enjoy!
diff --git a/compose/gitlab/README.md b/compose/gitlab/README.md
index f9cf9dc..9265ec6 100644
--- a/compose/gitlab/README.md
+++ b/compose/gitlab/README.md
@@ -29,9 +29,11 @@ ports:
   - "522:22"
 ```
 
+More information on GitLab on docker could be found [here][gitlab-docker1] and
+[here][gitlab-docker2].
+
 [gitlab-ce]: https://docs.gitlab.com/ce/README.html
 [gitlab-usb]: https://blog.sixeyed.com/run-gitlab-on-a-usb-stick-with-docker/
 [gitlab-tags]: https://hub.docker.com/r/gitlab/gitlab-ce/tags/
-
-https://hub.docker.com/r/gitlab/gitlab-ce/
-https://docs.gitlab.com/omnibus/docker/README.html
+[gitlab-docker1]: https://hub.docker.com/r/gitlab/gitlab-ce/
+[gitlab-docker2]: https://docs.gitlab.com/omnibus/docker/README.html