Skip to content

Commit

Permalink
Updated openssl version (#107)
Browse files Browse the repository at this point in the history
* Removed obsolete openssl windows binary files. 
* Updated manylinux dockerfile to pull openssl remotely, removed openssl manylinux file.
* Migrated manylinux builds to 2010.
* Removed perl binary files.
  • Loading branch information
pkittenis committed Aug 14, 2020
1 parent 5aa507b commit cf7b015
Show file tree
Hide file tree
Showing 13 changed files with 5 additions and 51 deletions.
3 changes: 0 additions & 3 deletions ci/appveyor/openssl-1.0.2q-i386-win32.zip

This file was deleted.

3 changes: 0 additions & 3 deletions ci/appveyor/openssl-1.0.2q-x64_86-win64.zip

This file was deleted.

3 changes: 0 additions & 3 deletions ci/appveyor/openssl-1.1.0h-x32-VC2017.zip

This file was deleted.

20 changes: 5 additions & 15 deletions ci/docker/manylinux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
FROM quay.io/pypa/manylinux1_x86_64
FROM quay.io/pypa/manylinux2010_x86_64

ENV CMAKE cmake-2.8.11.1-5.4.x86_64
ENV OPENSSL openssl-1.1.1b
ENV OPENSSL openssl-1.1.1g
ENV SYSTEM_LIBSSH2 1
ENV LIBSSH2_VERSION 1.9.0

RUN yum install zlib-devel -y

ADD libssh2-${LIBSSH2_VERSION}.tar.gz libssh2-${LIBSSH2_VERSION}.tar.gz
ADD ${CMAKE}.rpm cmake.rpm
ADD ${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
ADD local-perl-5.10.0-62.ep.x86_64.rpm local-perl.rpm
ADD local-perl-Pod-Simple-3.07-62.ep.x86_64.rpm local-perl-Pod-Simple.rpm
ADD local-perl-Module-Pluggable-3.60-62.ep.x86_64.rpm local-perl-Module-Pluggable.rpm
ADD local-perl-XSLoader-0.10-1.noarch.rpm local-perl-XSLoader.rpm
ADD local-perl-version-0.74-62.ep.x86_64.rpm local-perl-version.rpm
ADD local-perl-libs-5.10.0-62.ep.x86_64.rpm local-perl-libs.rpm
ADD local-perl-Pod-Escapes-1.04-62.ep.x86_64.rpm local-perl-Pod-Escapes.rpm

RUN rpm -i cmake.rpm local-perl-Module-Pluggable.rpm local-perl-Pod-Escapes.rpm local-perl-Pod-Simple.rpm local-perl-XSLoader.rpm local-perl-version.rpm local-perl-libs.rpm local-perl.rpm
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

RUN tar -xzf ${OPENSSL}.tar.gz
# Openssl
RUN cd ${OPENSSL}.tar.gz/${OPENSSL} && \
RUN cd ${OPENSSL} && \
./config --prefix=/usr --openssldir=/usr/openssl threads shared && \
make -j4 && make install

Expand Down
3 changes: 0 additions & 3 deletions ci/docker/manylinux/cmake-2.8.11.1-5.4.x86_64.rpm

This file was deleted.

3 changes: 0 additions & 3 deletions ci/docker/manylinux/local-perl-5.10.0-62.ep.x86_64.rpm

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions ci/docker/manylinux/local-perl-XSLoader-0.10-1.noarch.rpm

This file was deleted.

3 changes: 0 additions & 3 deletions ci/docker/manylinux/local-perl-libs-5.10.0-62.ep.x86_64.rpm

This file was deleted.

3 changes: 0 additions & 3 deletions ci/docker/manylinux/local-perl-version-0.74-62.ep.x86_64.rpm

This file was deleted.

3 changes: 0 additions & 3 deletions ci/docker/manylinux/openssl-1.1.1b.tar.gz

This file was deleted.

0 comments on commit cf7b015

Please sign in to comment.