mirror of
https://github.com/Kitware/CMake.git
synced 2026-06-27 18:28:20 +00:00
Utilities/Release: Update docker specs for linux-x86_64 to centos 7 vault
Update the centos 7 base image to use `vault.centos.org` repositories so we can rebuild again in the future. While at it, update to OpenSSL 3.6.0.
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
|
||||
|
||||
.linux_release_x86_64:
|
||||
image: "kitware/cmake:build-linux-x86_64-deps-2023-08-16@sha256:aa0ebdbd90a51cc83d31f393c5c48ec4599a28f7ccdc288558522c6265b24fae"
|
||||
image: "kitware/cmake:build-linux-x86_64-deps-2026-01-13@sha256:eae18d032e8d7be3caa97d2e5754ae2b7196d7a3d375b7b4d1ba9034f1229317"
|
||||
|
||||
variables:
|
||||
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
# The resulting image will have an '/out' directory containing the package.
|
||||
|
||||
# Keep this in sync with the `.gitlab/os-linux.yml` `.linux_release_x86_64` image.
|
||||
ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-x86_64-deps-2023-08-16
|
||||
ARG FROM_IMAGE_DIGEST=@sha256:aa0ebdbd90a51cc83d31f393c5c48ec4599a28f7ccdc288558522c6265b24fae
|
||||
ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-x86_64-deps-2026-01-13
|
||||
ARG FROM_IMAGE_DIGEST=@sha256:eae18d032e8d7be3caa97d2e5754ae2b7196d7a3d375b7b4d1ba9034f1229317
|
||||
ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST
|
||||
FROM $FROM_IMAGE
|
||||
|
||||
|
||||
@@ -9,8 +9,12 @@ ARG FROM_IMAGE_DIGEST=@sha256:be65f488b7764ad3638f236b7b515b3678369a5124c47b8d32
|
||||
ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST
|
||||
FROM $FROM_IMAGE
|
||||
|
||||
COPY repo-vault.sed /root/
|
||||
|
||||
RUN : \
|
||||
&& sed -f /root/repo-vault.sed -i /etc/yum.repos.d/*.repo \
|
||||
&& yum install -y centos-release-scl \
|
||||
&& sed -f /root/repo-vault.sed -i /etc/yum.repos.d/*.repo \
|
||||
&& yum install -y \
|
||||
ca-certificates \
|
||||
curl \
|
||||
@@ -24,6 +28,7 @@ RUN : \
|
||||
make \
|
||||
patch \
|
||||
perl \
|
||||
perl-core \
|
||||
python3-pip \
|
||||
xz \
|
||||
which \
|
||||
|
||||
3
Utilities/Release/linux/x86_64/base/repo-vault.sed
Normal file
3
Utilities/Release/linux/x86_64/base/repo-vault.sed
Normal file
@@ -0,0 +1,3 @@
|
||||
# Switch to CentOS vault repositories.
|
||||
/^mirrorlist=/d
|
||||
s|^# *baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|
|
||||
@@ -4,8 +4,8 @@
|
||||
# Produce an image with custom-built dependencies for portable CMake binaries.
|
||||
# Build using the directory containing this file as its own build context.
|
||||
|
||||
ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-x86_64-base-2023-08-16
|
||||
ARG FROM_IMAGE_DIGEST=@sha256:95c4d937a635067096dc8fa21b20cce6108ced091d3c42d56cf0261f40406a10
|
||||
ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-x86_64-base-2026-01-13
|
||||
ARG FROM_IMAGE_DIGEST=@sha256:66bbc699da90b66fbfe5ee6161026587b78bcd01b903740b1287f80c40adfc95
|
||||
ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST
|
||||
FROM $FROM_IMAGE
|
||||
|
||||
@@ -123,10 +123,10 @@ COPY openssl-source.patch /opt/openssl/src/
|
||||
RUN : \
|
||||
&& mkdir -p /opt/openssl/src \
|
||||
&& cd /opt/openssl/src \
|
||||
&& curl -O https://www.openssl.org/source/openssl-1.1.1v.tar.gz \
|
||||
&& sha512sum openssl-1.1.1v.tar.gz | grep -q 1a67340d99026aa62bf50ff89165d9f77fe4a6690fe30d1751b5021dd3f238391afd581b41724687c322c4e3af1770c44a63766a06e9b8cab6425101153e0c7e \
|
||||
&& tar xzf openssl-1.1.1v.tar.gz \
|
||||
&& cd openssl-1.1.1v \
|
||||
&& curl -OL https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz \
|
||||
&& sha256sum openssl-3.6.0.tar.gz | grep -q b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9 \
|
||||
&& tar xzf openssl-3.6.0.tar.gz \
|
||||
&& cd openssl-3.6.0 \
|
||||
&& patch -p1 -i ../openssl-source.patch \
|
||||
&& source /opt/rh/devtoolset-7/enable \
|
||||
&& ./Configure --prefix=/opt/openssl linux-elf no-asm no-shared -D_POSIX_C_SOURCE=199506L -D_POSIX_SOURCE=1 -D_SVID_SOURCE=1 -D_BSD_SOURCE=1 \
|
||||
|
||||
@@ -8,5 +8,5 @@
|
||||
+#undef _POSIX_C_SOURCE
|
||||
+#undef _POSIX_SOURCE
|
||||
|
||||
#include <openssl/crypto.h>
|
||||
#include "internal/cryptlib.h"
|
||||
/* We need to use the OPENSSL_fork_*() deprecated APIs */
|
||||
#define OPENSSL_SUPPRESS_DEPRECATED
|
||||
|
||||
Reference in New Issue
Block a user