From 25ae8eed2a97118f34f3bc4d578d1cd227b8d7f8 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 15 Nov 2024 09:51:34 +0100 Subject: [PATCH] make: clean ci --- makefiles/Makefile | 3 +- makefiles/docker/centos/Dockerfile | 44 ----------------------- makefiles/docker/centos/cpp.Dockerfile | 15 -------- makefiles/docker/centos/dotnet.Dockerfile | 22 ------------ makefiles/docker/centos/java.Dockerfile | 18 ---------- makefiles/docker/centos/python.Dockerfile | 19 ---------- makefiles/docker/fedora/Dockerfile | 2 +- makefiles/docker/ubuntu/Dockerfile | 8 +---- 8 files changed, 3 insertions(+), 128 deletions(-) delete mode 100644 makefiles/docker/centos/Dockerfile delete mode 100644 makefiles/docker/centos/cpp.Dockerfile delete mode 100644 makefiles/docker/centos/dotnet.Dockerfile delete mode 100644 makefiles/docker/centos/java.Dockerfile delete mode 100644 makefiles/docker/centos/python.Dockerfile diff --git a/makefiles/Makefile b/makefiles/Makefile index 93d5d96678..7b6b461c13 100644 --- a/makefiles/Makefile +++ b/makefiles/Makefile @@ -52,7 +52,6 @@ help: @echo -e "\tWith ${BOLD}${RESET}:" @echo -e "\t\t${BOLD}alpine${RESET} (edge)" @echo -e "\t\t${BOLD}archlinux${RESET} (latest)" - @echo -e "\t\t${BOLD}centos${RESET} (latest)" @echo -e "\t\t${BOLD}debian${RESET} (latest)" @echo -e "\t\t${BOLD}fedora${RESET} (latest)" @echo -e "\t\t${BOLD}opensuse${RESET} (tumbleweed)" @@ -111,7 +110,7 @@ endif DOCKER_RUN_CMD := docker run --rm --init --net=host # Currently supported distro -DISTROS = alpine archlinux centos debian fedora opensuse ubuntu +DISTROS = alpine archlinux debian fedora opensuse ubuntu LANGUAGES = cpp python java dotnet # $* stem diff --git a/makefiles/docker/centos/Dockerfile b/makefiles/docker/centos/Dockerfile deleted file mode 100644 index 9c0497cea3..0000000000 --- a/makefiles/docker/centos/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -# Create a virtual environment with all tools installed -# ref: https://quay.io/repository/centos/centos -FROM quay.io/centos/centos:stream AS base -# Install system build dependencies -ENV PATH=/usr/local/bin:$PATH -RUN dnf -y update \ -&& dnf -y install \ - git wget which redhat-lsb-core openssl-devel pkgconfig autoconf libtool zlib-devel \ -&& dnf -y groupinstall "Development Tools" \ -&& dnf clean all \ -&& rm -rf /var/cache/dnf - -# Install system build dependencies -ENV PATH=/usr/local/bin:$PATH -RUN dnf -y update \ -&& dnf -y install gcc-toolset-11 \ -&& dnf clean all \ -&& rm -rf /var/cache/dnf - -RUN echo "source /opt/rh/gcc-toolset-11/enable" >> /etc/bashrc -SHELL ["/bin/bash", "--login", "-c"] - -# Install CMake 3.28.3 -RUN wget -q "https://cmake.org/files/v3.28/cmake-3.28.3-linux-x86_64.sh" \ -&& chmod a+x cmake-3.28.3-linux-x86_64.sh \ -&& ./cmake-3.28.3-linux-x86_64.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.28.3-linux-x86_64.sh -CMD [ "/usr/bin/bash" ] - -# Install SWIG 4.2.1 -FROM base AS swig -RUN dnf -y update \ -&& dnf -y install pcre2-devel \ -&& dnf clean all \ -&& rm -rf /var/cache/dnf \ -&& wget -q "https://downloads.sourceforge.net/project/swig/swig/swig-4.2.1/swig-4.2.1.tar.gz" \ -&& tar xvf swig-4.2.1.tar.gz \ -&& rm swig-4.2.1.tar.gz \ -&& cd swig-4.2.1 \ -&& ./configure --prefix=/usr \ -&& make -j 4 \ -&& make install \ -&& cd .. \ -&& rm -rf swig-4.2.1 diff --git a/makefiles/docker/centos/cpp.Dockerfile b/makefiles/docker/centos/cpp.Dockerfile deleted file mode 100644 index b9c6ddca8f..0000000000 --- a/makefiles/docker/centos/cpp.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM ortools/make:centos_base AS env -RUN make -version - -FROM env AS devel -WORKDIR /home/project -COPY . . - -FROM devel AS build -RUN make cpp - -FROM build AS test -RUN make test_cpp - -FROM build AS package -RUN make package_cpp diff --git a/makefiles/docker/centos/dotnet.Dockerfile b/makefiles/docker/centos/dotnet.Dockerfile deleted file mode 100644 index f1f4424ee8..0000000000 --- a/makefiles/docker/centos/dotnet.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM ortools/make:centos_swig AS env -# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos8 -RUN dnf -y update \ -&& dnf -y install dotnet-sdk-6.0 \ -&& dnf clean all \ -&& rm -rf /var/cache/dnf -# Trigger first run experience by running arbitrary cmd -RUN dotnet --info - -# Add the library src to our build env -FROM env AS devel -WORKDIR /home/project -COPY . . - -FROM devel AS build -RUN make dotnet - -FROM build AS test -RUN make test_dotnet - -FROM build AS package -RUN make package_dotnet diff --git a/makefiles/docker/centos/java.Dockerfile b/makefiles/docker/centos/java.Dockerfile deleted file mode 100644 index db1d6d99f1..0000000000 --- a/makefiles/docker/centos/java.Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ortools/make:centos_swig AS env -RUN dnf -y update \ -&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \ -&& dnf clean all \ -&& rm -rf /var/cache/dnf - -FROM env AS devel -WORKDIR /home/project -COPY . . - -FROM devel AS build -RUN make java - -FROM build AS test -RUN make test_java - -FROM build AS package -RUN make package_java diff --git a/makefiles/docker/centos/python.Dockerfile b/makefiles/docker/centos/python.Dockerfile deleted file mode 100644 index 37c39122a9..0000000000 --- a/makefiles/docker/centos/python.Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM ortools/make:centos_swig AS env -RUN dnf -y update \ -&& dnf -y install python3.11-devel python3.11-numpy python3.11-pip \ -&& dnf clean all \ -&& rm -rf /var/cache/dnf -RUN python3.11 -m pip install absl-py mypy mypy-protobuf pandas - -FROM env AS devel -WORKDIR /home/project -COPY . . - -FROM devel AS build -RUN make python - -FROM build AS test -RUN make test_python - -FROM build AS package -RUN make package_python diff --git a/makefiles/docker/fedora/Dockerfile b/makefiles/docker/fedora/Dockerfile index 004985df5e..fb28481eb9 100644 --- a/makefiles/docker/fedora/Dockerfile +++ b/makefiles/docker/fedora/Dockerfile @@ -6,7 +6,7 @@ ENV PATH=/usr/local/bin:$PATH RUN dnf -y update \ && dnf -y install git wget \ which redhat-lsb-core pkgconfig autoconf libtool zlib-devel \ -&& dnf -y groupinstall "Development Tools" \ +&& dnf -y install @development-tools \ && dnf -y install gcc-c++ cmake \ && dnf clean all CMD [ "/usr/bin/bash" ] diff --git a/makefiles/docker/ubuntu/Dockerfile b/makefiles/docker/ubuntu/Dockerfile index 22d71efe5e..b825b24c8d 100644 --- a/makefiles/docker/ubuntu/Dockerfile +++ b/makefiles/docker/ubuntu/Dockerfile @@ -6,15 +6,9 @@ ENV PATH=/usr/local/bin:$PATH RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq \ git wget libssl-dev pkg-config build-essential \ - autoconf libtool zlib1g-dev lsb-release \ + cmake autoconf libtool zlib1g-dev lsb-release \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -# Install CMake 3.28.3 -RUN wget -q "https://cmake.org/files/v3.28/cmake-3.28.3-linux-x86_64.sh" \ -&& chmod a+x cmake-3.28.3-linux-x86_64.sh \ -&& ./cmake-3.28.3-linux-x86_64.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.28.3-linux-x86_64.sh CMD [ "/usr/bin/bash" ] FROM base AS swig