From 2825bbb6a9c2ffe1d3af8a01f63683f4971c0ce1 Mon Sep 17 00:00:00 2001
From: Mr Bot <admin@epicm.org>
Date: Thu, 7 Mar 2019 01:06:06 +0300
Subject: [PATCH] 03\07\19

---
 bitbucket/latest/entrypoint.sh  | 8 ++++++++
 confluence/latest/entrypoint.sh | 6 ++++++
 jira/latest/Dockerfile          | 9 +++++++--
 jira/latest/entrypoint.sh       | 5 +++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/bitbucket/latest/entrypoint.sh b/bitbucket/latest/entrypoint.sh
index eb02f69b3..842224a8c 100755
--- a/bitbucket/latest/entrypoint.sh
+++ b/bitbucket/latest/entrypoint.sh
@@ -4,6 +4,14 @@ set -euo pipefail
 # Set recommended umask of "u=,g=w,o=rwx" (0027)
 umask 0027
 
+export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
+export JRE_HOME="$JAVA_HOME/jre"
+export JAVA_BINARY="$JRE_HOME/bin/java"
+export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}')
+
+#export PATH=$JAVA_HOME/bin:$PATH
+
+
 # Setup Catalina Opts
 : ${CATALINA_CONNECTOR_PROXYNAME:=}
 : ${CATALINA_CONNECTOR_PROXYPORT:=}
diff --git a/confluence/latest/entrypoint.sh b/confluence/latest/entrypoint.sh
index d9f474bf3..250fc031a 100755
--- a/confluence/latest/entrypoint.sh
+++ b/confluence/latest/entrypoint.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 set -euo pipefail
 
+export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
+export JRE_HOME="$JAVA_HOME/jre"
+export JAVA_BINARY="$JRE_HOME/bin/java"
+export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}')
+
+
 # Setup Catalina Opts
 : ${CATALINA_CONNECTOR_PROXYNAME:=}
 : ${CATALINA_CONNECTOR_PROXYPORT:=}
diff --git a/jira/latest/Dockerfile b/jira/latest/Dockerfile
index 62813baf3..d69ac0a52 100644
--- a/jira/latest/Dockerfile
+++ b/jira/latest/Dockerfile
@@ -13,12 +13,17 @@ ENV DEBIAN_FRONTEND noninteractive
 #editing sources list
 RUN rm /etc/apt/sources.list
 COPY sources.list /etc/apt/sources.list
-COPY locale.gen /etc/locale.gen
+#COPY locale.gen /etc/locale.gen
 
 #installing utils
 # url: missing
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-RUN apt-get update && apt-get install -y --allow-unauthenticated htop mc tmux iftop cmatrix iputils-ping  cmatrix-xfont lsof lynx ca-certificates gnupg sudo apt-transport-https lsb-release apt-utils openjdk-8-jdk openjdk-8-jre locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig
+RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
+RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu disco main" | tee /etc/apt/sources.list.d/webupd8team-java.list
+RUN echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu disco main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list
+RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
+RUN apt-get update && apt-get install -y --allow-unauthenticated htop mc tmux iftop cmatrix iputils-ping oracle-java8-set-default  cmatrix-xfont lsof lynx ca-certificates gnupg sudo apt-transport-https lsb-release apt-utils oracle-java8-installer  locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig
 
 VOLUME ["${JIRA_HOME}"]
 WORKDIR $JIRA_HOME
diff --git a/jira/latest/entrypoint.sh b/jira/latest/entrypoint.sh
index 8d21b50a6..50ee4ecd1 100755
--- a/jira/latest/entrypoint.sh
+++ b/jira/latest/entrypoint.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 set -euo pipefail
 
+export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
+export JRE_HOME="$JAVA_HOME/jre"
+export JAVA_BINARY="$JRE_HOME/bin/java"
+export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}')
+
 # Setup Catalina Opts
 : ${CATALINA_CONNECTOR_PROXYNAME:=}
 : ${CATALINA_CONNECTOR_PROXYPORT:=}