#!/bin/bash
set -o errexit
set -o xtrace

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

# Environment defaults
if [ -z "${USER}" ]; then
    USER="docker"
fi
export USER

#!/bin/bash
set -o errexit
set -o xtrace

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

# Environment defaults
if [ -z "${USER}" ]; then
    USER="docker"
fi
export USER

# Setup compiler
if [ -z "${CC}" ]; then
    CC="gcc"
fi
export CC

if [ "${CC}" = "clang" ]; then
    if [ -z "${CXX}" ]; then
        CXX="clang++"
    fi
    COMPILER_PACKAGES="clang-3.4" # Ubuntu-specific apt package name
else
    if [ -z "${CXX}" ]; then
        CXX="g++"
    fi
    COMPILER_PACKAGES="${CC} ${CXX}" # Ubuntu-specific apt package names
fi
export CXX

# Install OS dependencies, assuming stock ubuntu:latest
apt-get update
apt-get install -y \
    curl \
    git-core \
    ${COMPILER_PACKAGES} \
    cmake \
    python \
    python2.7 \
    python2.7-dev

# Install pip
curl --silent --show-error --retry 5 -O http://releases.numenta.org/pip/1ebd3cb7a5a3073058d0c9552ab074bd/get-pip.py
python get-pip.py --upgrade --ignore-installed pip setuptools wheel

--- 
+++ 
@@ -9,37 +9,3 @@
     USER="docker"
 fi
 export USER
-
-# Setup compiler
-if [ -z "${CC}" ]; then
-    CC="gcc"
-fi
-export CC
-
-if [ "${CC}" = "clang" ]; then
-    if [ -z "${CXX}" ]; then
-        CXX="clang++"
-    fi
-    COMPILER_PACKAGES="clang-3.4" # Ubuntu-specific apt package name
-else
-    if [ -z "${CXX}" ]; then
-        CXX="g++"
-    fi
-    COMPILER_PACKAGES="${CC} ${CXX}" # Ubuntu-specific apt package names
-fi
-export CXX
-
-# Install OS dependencies, assuming stock ubuntu:latest
-apt-get update
-apt-get install -y \
-    curl \
-    git-core \
-    ${COMPILER_PACKAGES} \
-    cmake \
-    python \
-    python2.7 \
-    python2.7-dev
-
-# Install pip
-curl --silent --show-error --retry 5 -O http://releases.numenta.org/pip/1ebd3cb7a5a3073058d0c9552ab074bd/get-pip.py
-python get-pip.py --upgrade --ignore-installed pip setuptools wheel
Remove build tools setup for Linux CI jobs since new base image already provides these tools
