From f0f547510f3dc92a37b3314b2215141ce5a31c7d Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Fri, 25 Sep 2020 11:57:51 -0600 Subject: [PATCH 1/4] Adding python-louvain to testing infrastructure, as per issue 1626 --- linux_install_scripts/python_libs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_install_scripts/python_libs.sh b/linux_install_scripts/python_libs.sh index 56b2278..a9461d1 100644 --- a/linux_install_scripts/python_libs.sh +++ b/linux_install_scripts/python_libs.sh @@ -35,6 +35,7 @@ ENV DOCKER_PYTHON_OPTIONAL \ Pyro4 \ pytest \ pytest-qt \ + python-louvain \ sphinx \ sphinx_rtd_theme \ sympy \ From b1c4923f2c7030514a613fffa4529bf8b8bd11eb Mon Sep 17 00:00:00 2001 From: Gabriel Hackebeil Date: Fri, 25 Sep 2020 19:18:35 -0400 Subject: [PATCH 2/4] ignore ampl.com cert error --- linux_install_scripts/gsl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux_install_scripts/gsl.sh b/linux_install_scripts/gsl.sh index 705173f..7a8d61b 100644 --- a/linux_install_scripts/gsl.sh +++ b/linux_install_scripts/gsl.sh @@ -6,7 +6,7 @@ RUN echo "" && \ ARG TARGET="amplgsl.linux-intel64" RUN cd ${PREFIX} && \ rm -rf ${TARGET}.zip && \ - wget -q "https://www.ampl.com/NEW/amplgsl/${TARGET}.zip" && \ + wget -q --no-check-certificate "https://www.ampl.com/NEW/amplgsl/${TARGET}.zip" && \ mkdir Gsl && \ unzip -q -d Gsl ${TARGET}.zip && \ cd Gsl && \ From 3c704bd99d758fa8febc3e536b2044f909e68c71 Mon Sep 17 00:00:00 2001 From: Gabriel Hackebeil Date: Fri, 25 Sep 2020 19:55:47 -0400 Subject: [PATCH 3/4] Revert "ignore ampl.com cert error" This reverts commit b1c4923f2c7030514a613fffa4529bf8b8bd11eb. --- linux_install_scripts/gsl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux_install_scripts/gsl.sh b/linux_install_scripts/gsl.sh index 7a8d61b..705173f 100644 --- a/linux_install_scripts/gsl.sh +++ b/linux_install_scripts/gsl.sh @@ -6,7 +6,7 @@ RUN echo "" && \ ARG TARGET="amplgsl.linux-intel64" RUN cd ${PREFIX} && \ rm -rf ${TARGET}.zip && \ - wget -q --no-check-certificate "https://www.ampl.com/NEW/amplgsl/${TARGET}.zip" && \ + wget -q "https://www.ampl.com/NEW/amplgsl/${TARGET}.zip" && \ mkdir Gsl && \ unzip -q -d Gsl ${TARGET}.zip && \ cd Gsl && \ From 4011f0ba9ae2b8033b07880ec4f2010e0bf2b9f5 Mon Sep 17 00:00:00 2001 From: Gabriel Hackebeil Date: Sat, 26 Sep 2020 14:04:29 -0400 Subject: [PATCH 4/4] evil workaround for ampl cert failure --- create_linux_dockerfile.py | 5 +++-- linux_install_scripts/make_unsafe_wget.sh | 10 ++++++++++ linux_install_scripts/restore_standard_wget.sh | 6 ++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 linux_install_scripts/make_unsafe_wget.sh create mode 100644 linux_install_scripts/restore_standard_wget.sh diff --git a/create_linux_dockerfile.py b/create_linux_dockerfile.py index 0b6a957..24bd7c4 100644 --- a/create_linux_dockerfile.py +++ b/create_linux_dockerfile.py @@ -8,6 +8,7 @@ """ installs = ['linux_install_scripts/libs.sh', + 'linux_install_scripts/make_unsafe_wget.sh', 'linux_install_scripts/python_libs.sh', 'linux_install_scripts/baron.sh', # 'linux_install_scripts/mipcl.sh', @@ -17,8 +18,8 @@ 'linux_install_scripts/gams.sh', 'linux_install_scripts/glpk.sh', 'linux_install_scripts/ipopt.sh', - 'linux_install_scripts/cbc.sh' - ] + 'linux_install_scripts/cbc.sh', + 'linux_install_scripts/restore_standard_wget.sh'] dynamic_vars_filename = '/root/dynamic_vars.out' def create_dockerfile(source_image, python_exe, dirname): diff --git a/linux_install_scripts/make_unsafe_wget.sh b/linux_install_scripts/make_unsafe_wget.sh new file mode 100644 index 0000000..84d95ac --- /dev/null +++ b/linux_install_scripts/make_unsafe_wget.sh @@ -0,0 +1,10 @@ +RUN echo "" && \ + echo "===============" && \ + echo "OVERRIDING WGET" && \ + echo "===============" && \ + echo "" +RUN mv /usr/bin/wget /usr/bin/_wget && \ + echo '#! /bin/bash\n\ +_wget --no-check-certificate $@\n\ +' > /usr/bin/wget && \ + chmod a+x /usr/bin/wget diff --git a/linux_install_scripts/restore_standard_wget.sh b/linux_install_scripts/restore_standard_wget.sh new file mode 100644 index 0000000..12330c4 --- /dev/null +++ b/linux_install_scripts/restore_standard_wget.sh @@ -0,0 +1,6 @@ +RUN echo "" && \ + echo "==============" && \ + echo "RESTORING WGET" && \ + echo "==============" && \ + echo "" +RUN mv /usr/bin/_wget /usr/bin/wget