Changeset 14088


Ignore:
Timestamp:
Nov 15, 2019 4:18:52 PM (3 weeks ago)
Author:
aramle
Message:

#5877 Creating symlink for ant and making sure to use right pip command

Location:
BaseDockerImages/branches/dev-2379
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • BaseDockerImages/branches/dev-2379/Dockerfile

    r14084 r14088  
    5555RUN rm -rf ${USR_PATH}
    5656RUN rm -rf /*.tgz
     57RUN ln -s /opt/ant/ant /usr/bin/ant
    5758USER baseuser
  • BaseDockerImages/branches/dev-2379/scripts/setup_ant.sh

    r13415 r14088  
     1#!/bin/bash
    12#
    23#    Copyright (C) 2019 Modelon AB
     
    2425    wget http://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VERSION-bin.tar.gz
    2526    ANTTMP=anttmp
    26     mkdir $ANTTMP && cd $ANTTMP && tar -xvf ../apache-ant-$ANT_VERSION-bin.tar.gz && cd ..
     27    mkdir /opt/ant && mkdir $ANTTMP && cd $ANTTMP && tar -xvf ../apache-ant-$ANT_VERSION-bin.tar.gz && cd ..
    2728    mv $ANTTMP/apache-ant-$ANT_VERSION /opt/ant && rm -rf apache-ant-$ANT_VERSION-bin.tar.gz && rm -rf $ANTTMP
     29    ls -ls opt/ant
    2830    echo 'export ANT_HOME=/opt/ant/'>/etc/profile.d/antenv.sh
    2931    chmod 0755 /etc/profile.d/antenv.sh
  • BaseDockerImages/branches/dev-2379/scripts/setup_python.sh

    r14084 r14088  
    2121
    2222if [ "$PYTHON_VERSION" = "3" ]; then
     23    pip_command=pip3
    2324    BUILD_PKGS_JM_REDHAT="python3-pip python3-devel.x86_64"
    2425    BUILD_PKGS_JM_DEBIAN="python3-pip python3-dev"
    2526    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 jpype1==0.7.0"
    2627else
     28    pip_command=pip
    2729    BUILD_PKGS_JM_DEBIAN="python-lucene python-dev python-jpype"
    2830    BUILD_PKGS_JM_REDHAT="python-pip python-devel python-jpype"
     
    7577    if [ ! -z "${PYTHON_ENABLED}" ]; then
    7678        echo "${ME}:  Installing python packages..."
    77         pip3 install $BUILD_PYTHON_PIP_PACKAGES
     79        ${pip_command} install $BUILD_PYTHON_PIP_PACKAGES
    7880    fi
    7981fi
     
    8183if [ ! -z "${PYTHON_ENABLED}" ]; then
    8284    echo "${ME}: Installed python packages:"
    83     pip3 list
     85    ${pip_command} list
    8486fi
Note: See TracChangeset for help on using the changeset viewer.