Changeset 14077


Ignore:
Timestamp:
Nov 15, 2019 10:59:07 AM (3 weeks ago)
Author:
aramle
Message:

#5877 Correcting typo and changing to jdk 11 on Ubuntu

Location:
BaseDockerImages/branches/dev-2379/scripts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • BaseDockerImages/branches/dev-2379/scripts/setup_openjdk.sh

    r13415 r14077  
     1#!/bin/sh
    12#
    23#    Copyright (C) 2019 Modelon AB
     
    3334    yum -y install java-1.8.0-openjdk-devel
    3435elif [ "$LINUX_DISTRIBUTION" = "DEBIAN" ]; then
    35     apt-get -y install openjdk-8-jdk
     36    apt-get -y install openjdk-11-jdk
    3637else
    3738    echo "${ME}: No set openjdk distribution for current linux distribution, exiting..."
  • BaseDockerImages/branches/dev-2379/scripts/setup_python.sh

    r14076 r14077  
    2323    BUILD_PKGS_JM_REDHAT="python3-pip"
    2424    BUILD_PKGS_JM_DEBIAN="python3-pip"
    25     BUILD_PYTHON_PIP_PACKAGES="html5lib==1.0.1 notebook==6.0.1 jupyter==1.0.0 colorama=0.4.1 nbformat==4.4.0 Jinja2=2.10.1 openpyxl==2.6.3 mock==3.0.5 natsort==6.0.0 six==1.12.0 MarkupSafe==1.1.1 lxml==4.4.1 matplotlib==3.1.1 scipy==1.3.1 cython==0.29.13 nose==1.3.7 ipython==7.8.0 ipykernel==5.1.2"
     25    BUILD_PYTHON_PIP_PACKAGES="html5lib==1.0.1 notebook==6.0.1 jupyter==1.0.0 colorama==0.4.1 nbformat==4.4.0 Jinja2==2.10.1 openpyxl==2.6.3 mock==3.0.5 natsort==6.0.0 six==1.12.0 MarkupSafe==1.1.1 lxml==4.4.1 matplotlib==3.1.1 scipy==1.3.1 cython==0.29.13 nose==1.3.7 ipython==7.8.0 ipykernel==5.1.2"
    2626else
    2727    BUILD_PKGS_JM_DEBIAN="python-lucene python-dev python-jpype"
Note: See TracChangeset for help on using the changeset viewer.