This commit is contained in:
Mr Bot 2019-03-07 01:06:06 +03:00
parent 5102a70e42
commit 2825bbb6a9
4 changed files with 26 additions and 2 deletions

View File

@ -4,6 +4,14 @@ set -euo pipefail
# Set recommended umask of "u=,g=w,o=rwx" (0027) # Set recommended umask of "u=,g=w,o=rwx" (0027)
umask 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 # Setup Catalina Opts
: ${CATALINA_CONNECTOR_PROXYNAME:=} : ${CATALINA_CONNECTOR_PROXYNAME:=}
: ${CATALINA_CONNECTOR_PROXYPORT:=} : ${CATALINA_CONNECTOR_PROXYPORT:=}

View File

@ -1,6 +1,12 @@
#!/bin/bash #!/bin/bash
set -euo pipefail 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 # Setup Catalina Opts
: ${CATALINA_CONNECTOR_PROXYNAME:=} : ${CATALINA_CONNECTOR_PROXYNAME:=}
: ${CATALINA_CONNECTOR_PROXYPORT:=} : ${CATALINA_CONNECTOR_PROXYPORT:=}

View File

@ -13,12 +13,17 @@ ENV DEBIAN_FRONTEND noninteractive
#editing sources list #editing sources list
RUN rm /etc/apt/sources.list RUN rm /etc/apt/sources.list
COPY sources.list /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 #installing utils
# url: missing # url: missing
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections 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}"] VOLUME ["${JIRA_HOME}"]
WORKDIR $JIRA_HOME WORKDIR $JIRA_HOME

View File

@ -1,6 +1,11 @@
#!/bin/bash #!/bin/bash
set -euo pipefail 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 # Setup Catalina Opts
: ${CATALINA_CONNECTOR_PROXYNAME:=} : ${CATALINA_CONNECTOR_PROXYNAME:=}
: ${CATALINA_CONNECTOR_PROXYPORT:=} : ${CATALINA_CONNECTOR_PROXYPORT:=}