Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit 63b42203 authored by Philippe Gauron's avatar Philippe Gauron
Browse files

Correction installation Java sans dépôt externe

parent ef15c0cf
......@@ -377,21 +377,11 @@ then
info "downloading software for TANGO base tools"
## Install Oracle Java 8
if ! [ -f /etc/apt/sources.list.d/webupd8team-java.list ] \
|| [[ "$(grep -q 'deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main' /etc/apt/sources.list.d/webupd8team-java.list)" -eq "1" ]] \
|| [[ "$(grep -q 'deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main' /etc/apt/sources.list.d/webupd8team-java.list)" -eq "1" ]]
then
echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main" | sudo tee /etc/apt/sources.list.d/webupd8team-java.list
echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main" | sudo tee -a /etc/apt/sources.list.d/webupd8team-java.list
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
sudo apt update
fi
## Accept automatically Oracle license
echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | sudo debconf-set-selections
sudo apt install --assume-yes --allow-downgrades --allow-change-held-packages oracle-java8-installer
sudo apt install --assume-yes oracle-java8-set-default
## needed to replace OpenJDK by Oracle Java
sudo apt install -d --assume-yes libxrender1 libxtst6
echo "${REPO_DIR}/tmp/jdk-8u212-linux-x64.tar.gz"
if [ ! -f "${REPO_DIR}/tmp/jdk-8u212-linux-x64.tar.gz" ]
then
wget -c https://owncloud.lal.in2p3.fr/index.php/s/eIYoobHNPld4j34/download -O "${REPO_DIR}/tmp/jdk-8u212-linux-x64.tar.gz"
fi
## TANGO packages
sudo apt install -d --assume-yes tango-common tango-starter tango-test python-pytango libtango-doc libtango-dev liblog4j1.2-java
......@@ -592,10 +582,12 @@ if [ "${TANGO}" -eq "1" ]
then
echo
info "installation of TANGO base tools"
### Installation of Java
sudo apt install --assume-yes oracle-java8-installer oracle-java8-set-default
## needed to replace OpenJDK by Oracle Java
sudo apt install --assume-yes libxrender1 libxtst6
### Installation of Oracle Java
tar xvfz "${REPO_DIR}/tmp/jdk-8u212-linux-x64.tar.gz" -C "${REPO_DIR}/tmp/"
sudo mkdir /opt/java
sudo mv "${REPO_DIR}/tmp/jdk1.8.0_212" /opt/java/
sudo update-alternatives --install /usr/bin/java java /opt/java/jdk1.8.*/bin/java 2
sudo update-alternatives --set java /opt/java/jdk1.8.0_212/bin/java
### configuration of TANGO
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment