Merge pull request #18 from kelepirci/base-image-to-ubuntu-16-04

base-image-to-ubuntu-16-04
ome · Mar 8, 2019 · 757053f · 757053f
2 parents ede8d0d + 4ff3f0a
commit 757053f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .*un~
+.idea
diff --git 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,13 @@ 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 \
+       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}