Skip to content

Commit f5505f8

Browse files
enkoreenkore
committed
manylinux: openssl 3.1.1, krb5 1.21.1, remove manylinux2010
1 parent b11c02c commit f5505f8

10 files changed

+22
-61
lines changed

‎ci/build-manylinux.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
# License along with this library; if not, write to the Free Software
1616
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1717

18-
1918
docker_repo="parallelssh/ssh-manylinux"
2019
docker_files=(
21-
"ci/docker/manylinux/Dockerfile"
2220
"ci/docker/manylinux/Dockerfile.2014_x86_64"
2321
# "ci/docker/manylinux/Dockerfile.manylinux_2_24_x86_64"
2422
# "ci/docker/manylinux/Dockerfile.manylinux_2_28_x86_64"
@@ -36,10 +34,8 @@ if [[ $(uname -m) == "aarch64" ]]; then
3634
fi
3735

3836
for docker_file in "${docker_files[@]}"; do
39-
if [[ ${docker_file} == "ci/docker/manylinux/Dockerfile_2014_x86_64" ]]; then
37+
if [[ ${docker_file} == "ci/docker/manylinux/Dockerfile.2014_x86_64" ]]; then
4038
docker_tag="${docker_repo}:2014_x86_64"
41-
elif [[ ${docker_file} == "ci/docker/manylinux/Dockerfile" ]]; then
42-
docker_tag="${docker_repo}:2010_x86_64"
4339
elif [[ ${docker_file} == "ci/docker/manylinux/Dockerfile.manylinux_2_24_x86_64" ]]; then
4440
docker_tag="${docker_repo}:2_24_x86_64"
4541
elif [[ ${docker_file} == "ci/docker/manylinux/Dockerfile.manylinux_2_28_x86_64" ]]; then

‎ci/docker/manylinux/Dockerfile

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎ci/docker/manylinux/Dockerfile.2014_x86_64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
FROM quay.io/pypa/manylinux2014_x86_64
22

3-
ENV OPENSSL openssl-1.1.1q
3+
ENV OPENSSL openssl-3.1.1
44
ENV LIBSSH 0.10.5
5-
ENV KRB 1.18.4
5+
ENV KRB 1.21.1
66
ENV SYSTEM_LIBSSH 1
77
ENV CFLAGS "-g0 -s"
88

9-
RUN yum install zlib-devel cmake3 -y
9+
RUN yum install -y zlib-devel cmake3 perl-core
1010

1111
ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
1212
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

‎ci/docker/manylinux/Dockerfile.aarch64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
FROM quay.io/pypa/manylinux2014_aarch64
22

3-
ENV OPENSSL openssl-1.1.1q
3+
ENV OPENSSL openssl-3.1.1
44
ENV LIBSSH 0.10.5
5-
ENV KRB 1.18.4
5+
ENV KRB 1.21.1
66
ENV SYSTEM_LIBSSH 1
77
ENV CFLAGS "-g0 -s"
88

9-
RUN yum install epel-release -y && yum install zlib-devel cmake3 -y
9+
RUN yum install epel-release -y && yum install zlib-devel cmake3 perl-core -y
1010

1111
ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
1212
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

‎ci/docker/manylinux/Dockerfile.aarch64_2_24

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM quay.io/pypa/manylinux_2_24_aarch64
22

3-
ENV OPENSSL openssl-1.1.1q
3+
ENV OPENSSL openssl-3.1.1
44
ENV LIBSSH 0.10.5
5-
ENV KRB 1.18.4
5+
ENV KRB 1.21.1
66
ENV SYSTEM_LIBSSH 1
77
ENV CFLAGS "-g0 -s"
88
ENV OPENSSL_ROOT_DIR /usr/lib
99

10-
RUN apt-get update -y && apt-get install zlib1g-dev cmake -y
10+
RUN apt-get update -y && apt-get install zlib1g-dev cmake perl-core -y
1111

1212
ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
1313
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

‎ci/docker/manylinux/Dockerfile.aarch64_2_28

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM quay.io/pypa/manylinux_2_28_aarch64
22

3-
ENV OPENSSL openssl-1.1.1q
3+
ENV OPENSSL openssl-3.1.1
44
ENV LIBSSH 0.10.5
5-
ENV KRB 1.18.4
5+
ENV KRB 1.21.1
66
ENV SYSTEM_LIBSSH 1
77
ENV CFLAGS "-g0 -s"
88
ENV OPENSSL_ROOT_DIR /usr/lib
99

10-
RUN yum install zlib-devel cmake3 -y
10+
RUN yum install zlib-devel cmake3 perl-core -y
1111

1212
ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
1313
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

‎ci/docker/manylinux/Dockerfile.manylinux_2_24_x86_64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM quay.io/pypa/manylinux_2_24_x86_64
22

3-
ENV OPENSSL openssl-1.1.1q
3+
ENV OPENSSL openssl-3.1.1
44
ENV LIBSSH 0.10.5
5-
ENV KRB 1.18.4
5+
ENV KRB 1.21.1
66
ENV SYSTEM_LIBSSH 1
77
ENV CFLAGS "-g0 -s"
88
ENV OPENSSL_ROOT_DIR /usr/lib
99

10-
RUN apt-get update -y && apt-get install zlib1g-dev cmake -y
10+
RUN apt-get update -y && apt-get install zlib1g-dev cmake perl-core -y
1111

1212
ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
1313
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

‎ci/docker/manylinux/Dockerfile.manylinux_2_28_x86_64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM quay.io/pypa/manylinux_2_28_x86_64
22

3-
ENV OPENSSL openssl-1.1.1q
3+
ENV OPENSSL openssl-3.1.1
44
ENV LIBSSH 0.10.5
5-
ENV KRB 1.18.4
5+
ENV KRB 1.21.1
66
ENV SYSTEM_LIBSSH 1
77
ENV CFLAGS "-g0 -s"
88
ENV OPENSSL_ROOT_DIR /usr/lib
99

10-
RUN yum install zlib-devel cmake3 -y
10+
RUN yum install -y zlib-devel cmake3 perl-core
1111

1212
ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
1313
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

‎ci/docker/manylinux/krb5-1.18.4.tar.xz

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎ci/docker/manylinux/krb5-1.21.1.tar.xz

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:39183f9e6beceaa5dacf17f90da04fd994236ff5ba9117380048d84af0e862e5
3+
size 6194020

0 commit comments

Comments
 (0)