Merge pull request #4 from bluescarni/pr/update

Updates

.circleci/config.yml

@@ -6,33 +6,33 @@ orbs:
 jobs:
   manylinux228_aarch64_with_deps-build:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2204:current
     resource_class: arm.large
     steps:
     - checkout
     - docker/check:
         docker-username: DOCKERHUB_USERNAME
         docker-password: DOCKERHUB_TOKEN
     - docker/build:
-        dockerfile: Dockerfile228
-        extra_build_args: --build-arg ARCH=aarch64
+        dockerfile: Dockerfile
+        extra_build_args: --build-arg ARCH=aarch64 --build-arg MANYLINUXIMG=manylinux_2_28
         image: $DOCKERHUB_USERNAME/manylinux228_aarch64_with_deps
         tag: latest
     - docker/push:
         image: $DOCKERHUB_USERNAME/manylinux228_aarch64_with_deps
         tag: latest
   manylinux2014_aarch64_with_deps-build:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2204:current
     resource_class: arm.large
     steps:
     - checkout
     - docker/check:
         docker-username: DOCKERHUB_USERNAME
         docker-password: DOCKERHUB_TOKEN
     - docker/build:
-        dockerfile: Dockerfile2014
-        extra_build_args: --build-arg ARCH=aarch64
+        dockerfile: Dockerfile
+        extra_build_args: --build-arg ARCH=aarch64 --build-arg MANYLINUXIMG=manylinux2014
         image: $DOCKERHUB_USERNAME/manylinux2014_aarch64_with_deps
         tag: latest
     - docker/push:

.github/workflows/docker-image.yml

@@ -26,13 +26,14 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: ./Dockerfile228
+          file: ./Dockerfile
           platforms: linux/amd64
           push: true
           # This section is not necessary as this is the default in the Dockerfile,
           # Added to be explicit
           build-args: |
             ARCH=x86_64
+            MANYLINUXIMG=manylinux_2_28
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/manylinux228_x86_64_with_deps:latest
   manylinux2014_x86_64_with_deps-build:
     runs-on: ubuntu-latest
@@ -54,11 +55,12 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: ./Dockerfile2014
+          file: ./Dockerfile
           platforms: linux/amd64
           push: true
           # This section is not necessary as this is the default in the Dockerfile,
           # Added to be explicit
           build-args: |
             ARCH=x86_64
+            MANYLINUXIMG=manylinux2014
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/manylinux2014_x86_64_with_deps:latest

Dockerfile2014 → Dockerfile

@@ -1,5 +1,5 @@
 ARG ARCH=x86_64
-FROM docker.io/pagmo2/llvm_manylinux2014_$ARCH
+FROM docker.io/pagmo2/llvm_${MANYLINUXIMG}_${ARCH}
 
 # We install all dependencies in a somehow decreasing order of compile length as to
 # allow for downstream modifications to be efficient.
@@ -17,7 +17,7 @@ RUN curl -L https://raw.githubusercontent.com/esa/manylinux_x86_64_with_deps/mas
 
 # Install Boost
 WORKDIR /root/install
-ARG BOOST_VERSION="1.83.0"
+ARG BOOST_VERSION="1.85.0"
 # Boost libraries download
 RUN curl -L https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_`echo ${BOOST_VERSION}|tr "." "_"`.tar.bz2 > boost_`echo ${BOOST_VERSION}|tr "." "_"`.tar.bz2 \
   && tar xjf boost_`echo ${BOOST_VERSION}|tr "." "_"`.tar.bz2 \
@@ -47,7 +47,7 @@ RUN cd ThirdParty-Mumps && ./get.Mumps && ./configure && make && make install
 
 # Download Ipopt 
 WORKDIR /root/install
-ARG IPOPT_VERSION="3.14.13"
+ARG IPOPT_VERSION="3.14.16"
 RUN curl -L  https://github.com/coin-or/Ipopt/archive/releases/${IPOPT_VERSION}.tar.gz > ipopt.tar.gz \
   && tar -xvf ipopt.tar.gz > /dev/null \
   && mv Ipopt* ipopt
@@ -68,7 +68,7 @@ RUN curl -L http://www.mpfr.org/mpfr-${MPFR_VERSION}/mpfr-${MPFR_VERSION}.tar.gz
 
 # Installing TBB
 WORKDIR /root/install
-ARG TBB_VERSION="2021.11.0"
+ARG TBB_VERSION="2021.13.0"
 RUN curl -L https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${TBB_VERSION}.tar.gz > tbb.tar.gz \
   && tar xvf tbb.tar.gz > /dev/null 2>&1 \
   && cd oneTBB-${TBB_VERSION} \
@@ -93,7 +93,7 @@ RUN curl -L https://gitlab.com/libeigen/eigen/-/archive/${EIGEN3_VERSION}/eigen-
 
 # Install fmt
 WORKDIR /root/install
-ARG FMT_VERSION="10.1.1"
+ARG FMT_VERSION="10.2.1"
 RUN curl -L https://github.com/fmtlib/fmt/archive/${FMT_VERSION}.tar.gz > fmt.tar.gz \
   && tar xzf fmt.tar.gz > /dev/null 2>&1 \
   && cd fmt-${FMT_VERSION} \
@@ -146,7 +146,7 @@ RUN curl -L  https://github.com/stevengj/nlopt/archive/v${NLOPT_VERSION}.tar.gz
 
 # Install spdlog 
 WORKDIR /root/install
-ARG SPDLOG_VERSION="1.12.0"
+ARG SPDLOG_VERSION="1.13.0"
 RUN curl -L https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VERSION}.tar.gz  > spdlog-${SPDLOG_VERSION}.tar.gz \
   && tar xvf spdlog-${SPDLOG_VERSION}.tar.gz > /dev/null 2>&1 \
   && cd spdlog-${SPDLOG_VERSION} \
@@ -159,7 +159,7 @@ RUN curl -L https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VERSION
 
 # Install sleef 
 WORKDIR /root/install
-ARG SLEEF_VERSION="3.5.1"
+ARG SLEEF_VERSION="3.6.1"
 RUN curl -L https://github.com/shibatch/sleef/archive/${SLEEF_VERSION}.tar.gz  > sleef-${SLEEF_VERSION}.tar.gz \
   && tar xvf sleef-${SLEEF_VERSION}.tar.gz > /dev/null 2>&1 \
   && cd sleef-${SLEEF_VERSION} \
@@ -172,7 +172,7 @@ RUN curl -L https://github.com/shibatch/sleef/archive/${SLEEF_VERSION}.tar.gz  >
 
 # Install pybind11 
 WORKDIR /root/install
-ARG PYBIND11_VERSION="2.11.1"
+ARG PYBIND11_VERSION="2.13.1"
 RUN curl -L https://github.com/pybind/pybind11/archive/v${PYBIND11_VERSION}.tar.gz  > pybind11-${PYBIND11_VERSION}.tar.gz \
   && tar xvf pybind11-${PYBIND11_VERSION}.tar.gz > /dev/null 2>&1 \
   && cd pybind11-${PYBIND11_VERSION} \