Fix JDK issue (#13)

* Fix JDK installation

* Controller base image

Author: baghbidi

iofog-agent/Dockerfile

@@ -1,18 +1,20 @@
 FROM jpetazzo/dind
 
-RUN apt-get update -qq
-RUN apt-get install -qqy sudo
-RUN apt-get install -qqy curl
-RUN apt-get install -qqy jq
-RUN apt-get install -qqy software-properties-common
-RUN add-apt-repository -y ppa:webupd8team/java
-RUN apt-get update -qq
-RUN echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | sudo debconf-set-selections
-RUN apt-get install -y oracle-java8-installer
-RUN apt-get update -qq
-RUN curl -s https://packagecloud.io/install/repositories/iofog/iofog-agent/script.deb.sh | sudo bash
-RUN sudo apt-get install iofog-agent
-RUN touch /first_run.tmp
+RUN apt-get update -qq && \
+  apt-get install -qqy sudo && \
+  apt-get install -qqy curl && \
+  apt-get install -qqy jq
+
+ADD http://www.edgeworx.io/downloads/jdk/jdk-8u211-64.tar.gz /opt
+
+RUN cd /opt && \
+  tar xzf jdk-8u211-64.tar.gz && \
+  cd /opt/jdk1.8.0_211/ && \
+  update-alternatives --install /usr/bin/java java /opt/jdk1.8.0_211/bin/java 1100 && \
+  rm -R /opt/jdk-8u211-64.tar.gz && \
+  curl -s https://packagecloud.io/install/repositories/iofog/iofog-agent/script.deb.sh | sudo bash && \
+  sudo apt-get install iofog-agent && \
+  touch /first_run.tmp
 
 COPY start.sh /start.sh
 COPY config.xml /etc/iofog-agent/config.xml

iofog-connector/Dockerfile

@@ -1,17 +1,10 @@
-FROM ubuntu:16.04
+FROM iofog/java-ubuntu-x86:8u211
 
-RUN apt-get update --fix-missing -qq
-RUN apt-get install -qqy sudo
-RUN apt-get install -qqy curl
-RUN apt-get install -qqy software-properties-common
-RUN add-apt-repository -y ppa:webupd8team/java
-RUN apt-get update -qq
-RUN echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | sudo debconf-set-selections
-RUN apt-get install -y oracle-java8-installer
-RUN apt-get update -qq
-RUN curl -s https://packagecloud.io/install/repositories/iofog/iofog-connector/script.deb.sh | sudo bash
-RUN sudo apt-get install iofog-connector
-RUN touch /first_run.tmp
+RUN apt-get update --fix-missing -qq && \
+  apt-get install -qqy sudo curl && \
+  curl -s https://packagecloud.io/install/repositories/iofog/iofog-connector/script.deb.sh | sudo bash && \
+  sudo apt-get install iofog-connector && \
+  touch /first_run.tmp
 
 COPY . /
 

iofog-controller/Dockerfile

@@ -1,9 +1,8 @@
-FROM node:alpine
+FROM iofog/node-alpine-x86:8.16.0
 
-RUN apk add curl jq python bash
-RUN npm i -g iofogcontroller --unsafe-perm
-
-RUN touch /first_run.tmp
+RUN apk add curl jq bash && \
+  npm i -g iofogcontroller --unsafe-perm && \
+  touch /first_run.tmp
 
 COPY start.sh /