From fbf32b73ccc2113163acbfb189b2983036ae1bb0 Mon Sep 17 00:00:00 2001
From: Ferhat Ozkasgarli <ferhat@dice.fm>
Date: Fri, 8 Mar 2019 10:53:15 +0100
Subject: [PATCH 1/2] base-image-to-ubuntu-16-04

---
 .gitignore | 1 +
 Dockerfile | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6061341..66f94d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .*un~
+.idea
diff --git a/Dockerfile b/Dockerfile
index 5e01e19..71144fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 MAINTAINER ome-devel@lists.openmicroscopy.org.uk
 
 #############################################
 # ApacheDS installation
 #############################################
 
-ENV APACHEDS_VERSION 2.0.0-M24
+ENV APACHEDS_VERSION 2.0.0.AM25
 ENV APACHEDS_ARCH amd64
 
 ENV APACHEDS_ARCHIVE apacheds-${APACHEDS_VERSION}-${APACHEDS_ARCH}.deb
@@ -18,7 +18,8 @@ VOLUME ${APACHEDS_DATA}
 
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
     && apt-get update \
-    && apt-get install -y ldap-utils procps openjdk-7-jre-headless curl jq \
+    && apt-get install -y apt-utils \
+    && apt-get install -y ldap-utils procps openjdk-8-jre-headless curl jq \
     && curl http://www.eu.apache.org/dist//directory/apacheds/dist/${APACHEDS_VERSION}/${APACHEDS_ARCHIVE} > ${APACHEDS_ARCHIVE} \
     && dpkg -i ${APACHEDS_ARCHIVE} \
     && rm ${APACHEDS_ARCHIVE}

From 4ff3f0aaaeddf5d591c1d1e55974bdd51d5672e4 Mon Sep 17 00:00:00 2001
From: Ferhat Ozkasgarli <ferhat@dice.fm>
Date: Fri, 8 Mar 2019 13:48:22 +0100
Subject: [PATCH 2/2] Fix Dockerfile

---
 Dockerfile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 71144fa..a254766 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,8 +18,13 @@ VOLUME ${APACHEDS_DATA}
 
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
     && apt-get update \
-    && apt-get install -y apt-utils \
-    && apt-get install -y ldap-utils procps openjdk-8-jre-headless curl jq \
+    && apt-get install -y \
+       apt-utils \
+       ldap-utils \
+       procps \
+       openjdk-8-jre-headless \
+       curl \
+       jq \
     && curl http://www.eu.apache.org/dist//directory/apacheds/dist/${APACHEDS_VERSION}/${APACHEDS_ARCHIVE} > ${APACHEDS_ARCHIVE} \
     && dpkg -i ${APACHEDS_ARCHIVE} \
     && rm ${APACHEDS_ARCHIVE}