Skip to content
This repository was archived by the owner on Mar 10, 2025. It is now read-only.

Commit 8b51706

Browse files
committed
Moving CBC back to the end - adding back removed libraries
1 parent 2ba5f9a commit 8b51706

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
- NAME=python_2.7 SRC_IMAGE=python:2.7-buster SRC_PYTHON_EXE=python
1919
- NAME=pypy_3 SRC_IMAGE=pypy:3 SRC_PYTHON_EXE=pypy3
2020
- NAME=pypy_2 SRC_IMAGE=pypy:2 SRC_PYTHON_EXE=pypy
21-
- NAME=anaconda_3 SRC_IMAGE=continuumio/anaconda3:latest SRC_PYTHON_EXE=python
21+
- NAME=anaconda_3 SRC_IMAGE=continuumio/anaconda3:latest SRC_PYTHON_EXE=python
2222
- NAME=anaconda_2 SRC_IMAGE=continuumio/anaconda2:latest SRC_PYTHON_EXE=python
2323

2424
script:

create_linux_dockerfile.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
installs = ['linux_install_scripts/libs.sh',
1111
'linux_install_scripts/python_libs.sh',
1212
'linux_install_scripts/baron.sh',
13-
'linux_install_scripts/cbc.sh',
1413
# 'linux_install_scripts/mipcl.sh',
1514
'linux_install_scripts/gsl.sh',
1615
'linux_install_scripts/gjh.sh',
1716
'linux_install_scripts/gjh_asl_json.sh',
1817
'linux_install_scripts/gams.sh',
1918
'linux_install_scripts/glpk.sh',
20-
'linux_install_scripts/ipopt.sh'
19+
'linux_install_scripts/ipopt.sh',
20+
'linux_install_scripts/cbc.sh'
2121
]
2222
dynamic_vars_filename = '/root/dynamic_vars.out'
2323

linux_install_scripts/libs.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ RUN echo "" && \
33
echo "INSTALLING COMMON LIBS" && \
44
echo "======================" && \
55
echo ""
6-
RUN apt-get -q update && \
6+
RUN dpkg --add-architecture i386 && \
7+
apt-get -q update && \
78
apt-get -q -y --no-install-recommends install \
89
build-essential libssl-dev libffi-dev \
910
wget zip unzip \
1011
git subversion cmake \
11-
gfortran glpk-utils \
12+
gfortran \
1213
libgfortran4 \
1314
libopenblas-dev \
1415
liblapack-dev \
1516
openmpi-bin openmpi-common libopenmpi-dev \
16-
libc6 libncurses5 libstdc++6 \
17+
libc6:i386 libncurses5:i386 libstdc++6:i386 \
1718
enchant \
1819
unixodbc unixodbc-dev && \
1920
rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)