diff --git a/ci_scripts/docker-coredeps/Dockerfile b/ci_scripts/docker-coredeps/Dockerfile index b3aa718ab..9e163636a 100644 --- a/ci_scripts/docker-coredeps/Dockerfile +++ b/ci_scripts/docker-coredeps/Dockerfile @@ -5,16 +5,6 @@ RUN echo /usr/local/lib64 > /etc/ld.so.conf.d/local.conf && \ echo /usr/local/lib >> /etc/ld.so.conf.d/local.conf ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig -ENV PIP_DISABLE_PIP_VERSION_CHECK 1 - -# Install python tools (auditwheels,tox, ...) -ADD deps/build_python.sh /builder/build_python.sh -RUN mkdir tmp1 && cd tmp1 && bash /builder/build_python.sh && cd .. && rm -r tmp1 - -# Install Rust nightly -ADD deps/build_rust.sh /builder/build_rust.sh -RUN mkdir tmp1 && cd tmp1 && bash /builder/build_rust.sh && cd .. && rm -r tmp1 - # Install a recent Perl, needed to install OpenSSL ADD deps/build_perl.sh /builder/build_perl.sh RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.sh && cd .. && rm -r tmp1 @@ -23,3 +13,12 @@ RUN mkdir tmp1 && cd tmp1 && bash /builder/build_perl.sh && cd .. && rm -r tmp1 ADD deps/build_openssl.sh /builder/build_openssl.sh RUN mkdir tmp1 && cd tmp1 && bash /builder/build_openssl.sh && cd .. && rm -r tmp1 +ENV PIP_DISABLE_PIP_VERSION_CHECK 1 + +# Install python tools (auditwheels,tox, ...) +ADD deps/build_python.sh /builder/build_python.sh +RUN mkdir tmp1 && cd tmp1 && bash /builder/build_python.sh && cd .. && rm -r tmp1 + +# Install Rust nightly +ADD deps/build_rust.sh /builder/build_rust.sh +RUN mkdir tmp1 && cd tmp1 && bash /builder/build_rust.sh && cd .. && rm -r tmp1 diff --git a/ci_scripts/docker-coredeps/deps/build_perl.sh b/ci_scripts/docker-coredeps/deps/build_perl.sh index 4acb51c3d..2440ee815 100755 --- a/ci_scripts/docker-coredeps/deps/build_perl.sh +++ b/ci_scripts/docker-coredeps/deps/build_perl.sh @@ -1,11 +1,11 @@ #!/bin/bash -PERL_VERSION=5.28.0 -PERL_SHA256=7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8 +PERL_VERSION=5.30.0 +# PERL_SHA256=7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8 curl -O https://www.cpan.org/src/5.0/perl-${PERL_VERSION}.tar.gz -echo "${PERL_SHA256} perl-${PERL_VERSION}.tar.gz" | sha256sum -c - -tar xzf perl-${PERL_VERSION}.tar.gz -cd perl-${PERL_VERSION} +# echo "${PERL_SHA256} perl-${PERL_VERSION}.tar.gz" | sha256sum -c - +tar -xzf perl-${PERL_VERSION}.tar.gz +cd perl-${PERL_VERSION} ./Configure -de make diff --git a/ci_scripts/docker-coredeps/deps/build_rust.sh b/ci_scripts/docker-coredeps/deps/build_rust.sh index d1d678348..95b08ddd5 100755 --- a/ci_scripts/docker-coredeps/deps/build_rust.sh +++ b/ci_scripts/docker-coredeps/deps/build_rust.sh @@ -1,11 +1,8 @@ #!/bin/bash -set -e -x +set -e -x -# Install Rust -curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-07-10 -y +# Install Rust +curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-09-12 -y export PATH=/root/.cargo/bin:$PATH rustc --version - -# remove some 300-400 MB that we don't need for automated builds -rm -rf /root/.rustup/toolchains/nightly-2019-07-10-x86_64-unknown-linux-gnu/share/