[arvados] created: 2.7.0-5679-g0c179e6fd8
git repository hosting
git at public.arvados.org
Fri Jan 5 21:57:30 UTC 2024
at 0c179e6fd8d37c70227b0039375a1513582beeb1 (commit)
commit 0c179e6fd8d37c70227b0039375a1513582beeb1
Author: Brett Smith <brett.smith at curii.com>
Date: Fri Jan 5 16:53:57 2024 -0500
21273: Build rocky8 Python packages against python39
We can no longer support the Python 3.6 that ships with rocky8. Building
against the latest appstream release is the most straightforward way to
continue building packages for the distro.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/build/package-build-dockerfiles/rocky8/Dockerfile b/build/package-build-dockerfiles/rocky8/Dockerfile
index a1bf643f9a..0eab1f5d36 100644
--- a/build/package-build-dockerfiles/rocky8/Dockerfile
+++ b/build/package-build-dockerfiles/rocky8/Dockerfile
@@ -6,7 +6,7 @@ ARG HOSTTYPE
ARG BRANCH
ARG GOVERSION
-FROM rockylinux:8.6-minimal as build_x86_64
+FROM rockylinux:8.8-minimal as build_x86_64
ONBUILD ARG BRANCH
# Install go
ONBUILD ARG GOVERSION
@@ -18,7 +18,7 @@ ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/
ONBUILD RUN npm install -g yarn
ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/
-FROM rockylinux:8.6-minimal as build_aarch64
+FROM rockylinux:8.8-minimal as build_aarch64
ONBUILD ARG BRANCH
# Install go
ONBUILD ARG GOVERSION
@@ -55,10 +55,8 @@ RUN microdnf --assumeyes --enablerepo=devel install \
patch \
postgresql-devel \
procps-ng \
- python3 \
- python3-devel \
- python3-pip \
- python3-virtualenv \
+ python39 \
+ python39-devel \
readline-devel \
rpm-build \
ruby \
commit 9c1aeaa583e20a46bc0bd111c6c51fbd7b205d26
Author: Brett Smith <brett.smith at curii.com>
Date: Fri Jan 5 16:52:47 2024 -0500
21273: Remove support for unsupported distros
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 355aadb41b..508e89194f 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -112,19 +112,6 @@ PYTHON3_EXECUTABLE=python3
PYTHON3_PKG_PREFIX=python3
PYTHON3_PREFIX=/usr
case "$TARGET" in
- centos7)
- FORMAT=rpm
- # In CentOS 7, libcurl is linked against libnss. pycurl needs to know
- # that in order to link to it correctly. This environment variable tells
- # it that.
- # libcurl is linked against openssl in RH8+ so this should not be
- # necessary in later versions.
- export PYCURL_SSL_LIBRARY=nss
- ;;
- ubuntu1804)
- FORMAT=deb
- PYTHON3_EXECUTABLE=python3.8
- ;;
centos*|rocky*)
FORMAT=rpm
;;
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list