From ebb8620133799b4ec6a404c5483a59fc226e26ca Mon Sep 17 00:00:00 2001 From: Amit Prinz Setter Date: Wed, 8 Nov 2023 11:56:04 +0200 Subject: [PATCH] docker build - bump base image to centos stream 9 Signed-off-by: Amit Prinz Setter --- src/deploy/NVA_build/NooBaa.Dockerfile | 8 +++----- src/deploy/NVA_build/Tests.Dockerfile | 4 ++-- src/deploy/NVA_build/builder.Dockerfile | 5 ++--- src/deploy/NVA_build/dev.Dockerfile | 3 +-- src/deploy/NVA_build/setup_platform.sh | 7 +++---- src/native/s3select/s3select.gyp | 2 +- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/deploy/NVA_build/NooBaa.Dockerfile b/src/deploy/NVA_build/NooBaa.Dockerfile index 602cb5b79e..467d38ade4 100644 --- a/src/deploy/NVA_build/NooBaa.Dockerfile +++ b/src/deploy/NVA_build/NooBaa.Dockerfile @@ -38,7 +38,7 @@ RUN tar \ # Cache: Rebuild when any layer is changing ############################################################## -FROM quay.io/centos/centos:stream8 +FROM quay.io/centos/centos:stream9 # The ports are overridden for Ceph Test later ENV container docker @@ -67,21 +67,19 @@ RUN dnf install -y -q bash \ rsyslog \ strace \ wget \ - curl \ nc \ less \ bash-completion \ python3-setuptools \ jemalloc \ - xz && \ + xz \ + pip && \ dnf clean all COPY ./src/deploy/NVA_build/install_arrow_run.sh ./src/deploy/NVA_build/install_arrow_run.sh ARG BUILD_S3SELECT_PARQUET=0 RUN ./src/deploy/NVA_build/install_arrow_run.sh $BUILD_S3SELECT_PARQUET -RUN mkdir -p /usr/local/lib/python3.6/site-packages - ############################################################## # Layers: # Title: Getting the node diff --git a/src/deploy/NVA_build/Tests.Dockerfile b/src/deploy/NVA_build/Tests.Dockerfile index 50a9adb156..633c6dcae4 100644 --- a/src/deploy/NVA_build/Tests.Dockerfile +++ b/src/deploy/NVA_build/Tests.Dockerfile @@ -13,8 +13,8 @@ ENV TEST_CONTAINER true ############################################################## RUN dnf group install -y -q "Development Tools" && \ - dnf install -y -q --nogpgcheck vim \ - which python3-virtualenv python36-devel libevent-devel libffi-devel libxml2-devel libxslt-devel zlib-devel \ + dnf install -y -q --nogpgcheck --enablerepo=crb vim \ + which python3-virtualenv python3-devel libevent-devel libffi-devel libxml2-devel libxslt-devel zlib-devel \ git \ tox && \ dnf clean all diff --git a/src/deploy/NVA_build/builder.Dockerfile b/src/deploy/NVA_build/builder.Dockerfile index 7db7713679..9337fd41c3 100644 --- a/src/deploy/NVA_build/builder.Dockerfile +++ b/src/deploy/NVA_build/builder.Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/centos/centos:stream8 +FROM quay.io/centos/centos:stream9 LABEL maintainer="Liran Mauda (lmauda@redhat.com)" ############################################################## @@ -14,10 +14,9 @@ RUN dnf update -y -q --nobest && \ COPY ./src/deploy/NVA_build/install_arrow_build.sh ./src/deploy/NVA_build/install_arrow_build.sh ARG BUILD_S3SELECT_PARQUET=0 RUN ./src/deploy/NVA_build/install_arrow_build.sh $BUILD_S3SELECT_PARQUET -RUN dnf install -y -q wget unzip which vim python2 python3 boost-devel && \ +RUN dnf install -y -q wget unzip which vim python3 boost-devel && \ dnf group install -y -q "Development Tools" && \ dnf clean all -RUN alternatives --set python /usr/bin/python3 RUN version="2.15.05" && \ wget -q -O nasm-${version}.tar.gz https://github.com/netwide-assembler/nasm/archive/nasm-${version}.tar.gz && \ tar -xf nasm-${version}.tar.gz && \ diff --git a/src/deploy/NVA_build/dev.Dockerfile b/src/deploy/NVA_build/dev.Dockerfile index 9c8517f286..50c11dcb01 100644 --- a/src/deploy/NVA_build/dev.Dockerfile +++ b/src/deploy/NVA_build/dev.Dockerfile @@ -1,5 +1,5 @@ # dev.Dockerfile is meant to be used manually for developer testing -FROM quay.io/centos/centos:stream8 +FROM quay.io/centos/centos:stream9 ENV container docker @@ -7,7 +7,6 @@ RUN dnf update -y -q && \ dnf install -y -q \ bash bash-completion \ wget curl nc unzip which less vim \ - python2 python2-setuptools \ python3 python3-setuptools \ gdb strace lsof \ openssl && \ diff --git a/src/deploy/NVA_build/setup_platform.sh b/src/deploy/NVA_build/setup_platform.sh index 2cd30aee80..97618294fc 100755 --- a/src/deploy/NVA_build/setup_platform.sh +++ b/src/deploy/NVA_build/setup_platform.sh @@ -21,12 +21,11 @@ function install_supervisor { if [ ${ID} == "centos" ] || [ ${ID} == "fedora" ] then deploy_log install_supervisor start - # easy_install is for Supervisord and comes from python-setuptools - /usr/bin/easy_install-3.6 supervisor - deploy_log install_supervisor done + pip install supervisor + deploy_log install_supervisor done fi - deploy_log "setup_supervisors start" + deploy_log "setup_supervisors start" mkdir -p /log/supervisor # Generate default supervisord config diff --git a/src/native/s3select/s3select.gyp b/src/native/s3select/s3select.gyp index b85307aecf..863c896e39 100644 --- a/src/native/s3select/s3select.gyp +++ b/src/native/s3select/s3select.gyp @@ -13,7 +13,7 @@ 's3select_napi.cpp' ], 'link_settings': { - 'libraries': ['/lib64/libboost_thread.so.1.66.0'] + 'libraries': ['/lib64/libboost_thread.so.1.75.0'] }, 'variables': { 'BUILD_S3SELECT_PARQUET%':0