From 33b21a1ab40234081feae978c48f25a674cd2375 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 24 Jul 2023 18:21:02 +0200 Subject: [PATCH] tools/docker: Cleanup fedora support * Remove EOL release (33 to 36) * Add Fedora-39 --- tools/docker/Makefile | 7 +- tools/docker/images/fedora-33.Dockerfile | 109 ------------------ tools/docker/images/fedora-34.Dockerfile | 99 ---------------- tools/docker/images/fedora-35.Dockerfile | 99 ---------------- ...ora-36.Dockerfile => fedora-39.Dockerfile} | 4 +- tools/docker/test/fedora-33/dotnet.Dockerfile | 33 ------ tools/docker/test/fedora-33/java.Dockerfile | 20 ---- tools/docker/test/fedora-33/python.Dockerfile | 14 --- tools/docker/test/fedora-34/cpp.Dockerfile | 14 --- tools/docker/test/fedora-34/python.Dockerfile | 14 --- tools/docker/test/fedora-35/cpp.Dockerfile | 14 --- tools/docker/test/fedora-35/dotnet.Dockerfile | 22 ---- tools/docker/test/fedora-35/java.Dockerfile | 20 ---- tools/docker/test/fedora-36/cpp.Dockerfile | 14 --- tools/docker/test/fedora-36/dotnet.Dockerfile | 22 ---- tools/docker/test/fedora-36/java.Dockerfile | 20 ---- tools/docker/test/fedora-36/python.Dockerfile | 14 --- .../{fedora-33 => fedora-39}/cpp.Dockerfile | 4 +- .../dotnet.Dockerfile | 4 +- .../{fedora-34 => fedora-39}/java.Dockerfile | 4 +- .../python.Dockerfile | 4 +- 21 files changed, 12 insertions(+), 543 deletions(-) delete mode 100644 tools/docker/images/fedora-33.Dockerfile delete mode 100644 tools/docker/images/fedora-34.Dockerfile delete mode 100644 tools/docker/images/fedora-35.Dockerfile rename tools/docker/images/{fedora-36.Dockerfile => fedora-39.Dockerfile} (96%) delete mode 100644 tools/docker/test/fedora-33/dotnet.Dockerfile delete mode 100644 tools/docker/test/fedora-33/java.Dockerfile delete mode 100644 tools/docker/test/fedora-33/python.Dockerfile delete mode 100644 tools/docker/test/fedora-34/cpp.Dockerfile delete mode 100644 tools/docker/test/fedora-34/python.Dockerfile delete mode 100644 tools/docker/test/fedora-35/cpp.Dockerfile delete mode 100644 tools/docker/test/fedora-35/dotnet.Dockerfile delete mode 100644 tools/docker/test/fedora-35/java.Dockerfile delete mode 100644 tools/docker/test/fedora-36/cpp.Dockerfile delete mode 100644 tools/docker/test/fedora-36/dotnet.Dockerfile delete mode 100644 tools/docker/test/fedora-36/java.Dockerfile delete mode 100644 tools/docker/test/fedora-36/python.Dockerfile rename tools/docker/test/{fedora-33 => fedora-39}/cpp.Dockerfile (83%) rename tools/docker/test/{fedora-34 => fedora-39}/dotnet.Dockerfile (89%) rename tools/docker/test/{fedora-34 => fedora-39}/java.Dockerfile (88%) rename tools/docker/test/{fedora-35 => fedora-39}/python.Dockerfile (82%) diff --git a/tools/docker/Makefile b/tools/docker/Makefile index b496baa1e17..8953782586f 100644 --- a/tools/docker/Makefile +++ b/tools/docker/Makefile @@ -96,12 +96,9 @@ help: @echo -e "\t\t${BOLD}debian-sid${RESET} (unstable)" @echo -e "\t\t${BOLD}debian-11${RESET} (bullseye, latest)" @echo -e "\t\t${BOLD}debian-10${RESET} (buster)" + @echo -e "\t\t${BOLD}fedora-39${RESET} (rawhide)" @echo -e "\t\t${BOLD}fedora-38${RESET} (rawhide)" @echo -e "\t\t${BOLD}fedora-37${RESET} (latest)" - @echo -e "\t\t${BOLD}fedora-36${RESET}" - @echo -e "\t\t${BOLD}fedora-35${RESET}" - @echo -e "\t\t${BOLD}fedora-34${RESET}" - @echo -e "\t\t${BOLD}fedora-33${RESET}" @echo -e "\t\t${BOLD}opensuse-leap${RESET} (latest)" @echo -e "\t\t${BOLD}ubuntu-23.04${RESET} (Ubuntu 23.04, rolling)" @echo -e "\t\t${BOLD}ubuntu-22.10${RESET} (Ubuntu 22.10)" @@ -407,7 +404,7 @@ DISTROS := \ archlinux \ centos-7 centos-8 \ debian-10 debian-11 debian-sid \ - fedora-33 fedora-34 fedora-35 fedora-36 fedora-37 fedora-38 \ + fedora-37 fedora-38 fedora-39 \ opensuse-leap \ ubuntu-20.04 ubuntu-22.04 ubuntu-22.10 ubuntu-23.04 diff --git a/tools/docker/images/fedora-33.Dockerfile b/tools/docker/images/fedora-33.Dockerfile deleted file mode 100644 index 10408bc8f52..00000000000 --- a/tools/docker/images/fedora-33.Dockerfile +++ /dev/null @@ -1,109 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:33 AS env - -############# -## SETUP ## -############# -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 gcc-c++ cmake \ -&& dnf clean all -ENTRYPOINT ["/usr/bin/bash", "-c"] -CMD ["/usr/bin/bash"] - -# Install SWIG -RUN dnf -y update \ -&& dnf -y install swig \ -&& dnf clean all - -# Install .Net -## .Net 3.1 -## see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora -RUN dnf -y update \ -&& dnf -y install dotnet-sdk-3.1 \ -&& dnf clean all -## .Net 6.0 -## see: https://dotnet.microsoft.com/download/dotnet-core/6.0 -RUN dotnet_sdk_version=6.0.100 \ -&& wget -qO dotnet.tar.gz \ -"https://dotnetcli.azureedge.net/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-x64.tar.gz" \ -&& dotnet_sha512='cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b' \ -&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& tar -C /usr/lib64/dotnet -oxzf dotnet.tar.gz \ -&& rm dotnet.tar.gz -# Trigger first run experience by running arbitrary cmd -RUN dotnet --info - -# Install Java -RUN dnf -y update \ -&& dnf -y install java-openjdk java-openjdk-devel maven \ -&& dnf clean all -ENV JAVA_HOME=/usr/lib/jvm/java-openjdk - -# Install Python -RUN dnf -y update \ -&& dnf -y install python3 python3-devel python3-pip \ -&& dnf clean all - -################ -## OR-TOOLS ## -################ -FROM env AS devel -WORKDIR /root -# Copy the snk key -COPY or-tools.snk /root/or-tools.snk -ENV DOTNET_SNK=/root/or-tools.snk - -ARG SRC_GIT_BRANCH -ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main} -ARG SRC_GIT_SHA1 -ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown} - -ARG OR_TOOLS_PATCH -ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999} - -# Download sources -# use SRC_GIT_SHA1 to modify the command -# i.e. avoid docker reusing the cache when new commit is pushed -RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \ -&& [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]] -WORKDIR /root/or-tools - -# C++ -## build -FROM devel AS cpp_build -RUN make detect_cpp \ -&& make cpp JOBS=8 -## archive -FROM cpp_build AS cpp_archive -RUN make archive_cpp - -# .Net -## build -FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON -RUN make detect_dotnet \ -&& make dotnet JOBS=8 -## archive -FROM dotnet_build AS dotnet_archive -RUN make archive_dotnet - -# Java -## build -FROM cpp_build AS java_build -RUN make detect_java \ -&& make java JOBS=8 -## archive -FROM java_build AS java_archive -RUN make archive_java - -# Python -## build -FROM cpp_build AS python_build -RUN make detect_python \ -&& make python JOBS=8 -## archive -FROM python_build AS python_archive -RUN make archive_python diff --git a/tools/docker/images/fedora-34.Dockerfile b/tools/docker/images/fedora-34.Dockerfile deleted file mode 100644 index 06b34027939..00000000000 --- a/tools/docker/images/fedora-34.Dockerfile +++ /dev/null @@ -1,99 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:34 AS env - -############# -## SETUP ## -############# -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 gcc-c++ cmake \ -&& dnf clean all -ENTRYPOINT ["/usr/bin/bash", "-c"] -CMD ["/usr/bin/bash"] - -# Install SWIG -RUN dnf -y update \ -&& dnf -y install swig \ -&& dnf clean all - -# Install .Net -# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora -RUN dnf -y update \ -&& dnf -y install dotnet-sdk-3.1 dotnet-sdk-6.0 \ -&& dnf clean all -# Trigger first run experience by running arbitrary cmd -RUN dotnet --info - -# Install Java -RUN dnf -y update \ -&& dnf -y install java-openjdk java-openjdk-devel maven \ -&& dnf clean all -ENV JAVA_HOME=/usr/lib/jvm/java-openjdk - -# Install Python -RUN dnf -y update \ -&& dnf -y install python3 python3-devel python3-pip \ -&& dnf clean all - -################ -## OR-TOOLS ## -################ -FROM env AS devel -WORKDIR /root -# Copy the snk key -COPY or-tools.snk /root/or-tools.snk -ENV DOTNET_SNK=/root/or-tools.snk - -ARG SRC_GIT_BRANCH -ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main} -ARG SRC_GIT_SHA1 -ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown} - -ARG OR_TOOLS_PATCH -ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999} - -# Download sources -# use SRC_GIT_SHA1 to modify the command -# i.e. avoid docker reusing the cache when new commit is pushed -RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \ -&& [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]] -WORKDIR /root/or-tools - -# C++ -## build -FROM devel AS cpp_build -RUN make detect_cpp \ -&& make cpp JOBS=8 -## archive -FROM cpp_build AS cpp_archive -RUN make archive_cpp - -# .Net -## build -FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON -RUN make detect_dotnet \ -&& make dotnet JOBS=8 -## archive -FROM dotnet_build AS dotnet_archive -RUN make archive_dotnet - -# Java -## build -FROM cpp_build AS java_build -RUN make detect_java \ -&& make java JOBS=8 -## archive -FROM java_build AS java_archive -RUN make archive_java - -# Python -## build -FROM cpp_build AS python_build -RUN make detect_python \ -&& make python JOBS=8 -## archive -FROM python_build AS python_archive -RUN make archive_python diff --git a/tools/docker/images/fedora-35.Dockerfile b/tools/docker/images/fedora-35.Dockerfile deleted file mode 100644 index ede1ef267c7..00000000000 --- a/tools/docker/images/fedora-35.Dockerfile +++ /dev/null @@ -1,99 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:35 AS env - -############# -## SETUP ## -############# -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 gcc-c++ cmake \ -&& dnf clean all -ENTRYPOINT ["/usr/bin/bash", "-c"] -CMD ["/usr/bin/bash"] - -# Install SWIG -RUN dnf -y update \ -&& dnf -y install swig \ -&& dnf clean all - -# Install .Net -# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora -RUN dnf -y update \ -&& dnf -y install dotnet-sdk-3.1 dotnet-sdk-6.0 \ -&& dnf clean all -# Trigger first run experience by running arbitrary cmd -RUN dotnet --info - -# Install Java -RUN dnf -y update \ -&& dnf -y install java-openjdk java-openjdk-devel maven \ -&& dnf clean all -ENV JAVA_HOME=/usr/lib/jvm/java-openjdk - -# Install Python -RUN dnf -y update \ -&& dnf -y install python3 python3-devel python3-pip \ -&& dnf clean all - -################ -## OR-TOOLS ## -################ -FROM env AS devel -WORKDIR /root -# Copy the snk key -COPY or-tools.snk /root/or-tools.snk -ENV DOTNET_SNK=/root/or-tools.snk - -ARG SRC_GIT_BRANCH -ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main} -ARG SRC_GIT_SHA1 -ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown} - -ARG OR_TOOLS_PATCH -ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999} - -# Download sources -# use SRC_GIT_SHA1 to modify the command -# i.e. avoid docker reusing the cache when new commit is pushed -RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \ -&& [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]] -WORKDIR /root/or-tools - -# C++ -## build -FROM devel AS cpp_build -RUN make detect_cpp \ -&& make cpp JOBS=8 -## archive -FROM cpp_build AS cpp_archive -RUN make archive_cpp - -# .Net -## build -FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON -RUN make detect_dotnet \ -&& make dotnet JOBS=8 -## archive -FROM dotnet_build AS dotnet_archive -RUN make archive_dotnet - -# Java -## build -FROM cpp_build AS java_build -RUN make detect_java \ -&& make java JOBS=8 -## archive -FROM java_build AS java_archive -RUN make archive_java - -# Python -## build -FROM cpp_build AS python_build -RUN make detect_python \ -&& make python JOBS=8 -## archive -FROM python_build AS python_archive -RUN make archive_python diff --git a/tools/docker/images/fedora-36.Dockerfile b/tools/docker/images/fedora-39.Dockerfile similarity index 96% rename from tools/docker/images/fedora-36.Dockerfile rename to tools/docker/images/fedora-39.Dockerfile index 022ae17d4bb..107480df76f 100644 --- a/tools/docker/images/fedora-36.Dockerfile +++ b/tools/docker/images/fedora-39.Dockerfile @@ -1,5 +1,5 @@ # ref: https://hub.docker.com/_/fedora -FROM fedora:36 AS env +FROM fedora:39 AS env ############# ## SETUP ## @@ -21,7 +21,7 @@ RUN dnf -y update \ # Install .Net # see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora RUN dnf -y update \ -&& dnf -y install dotnet-sdk-3.1 dotnet-sdk-6.0 \ +&& dnf -y install dotnet-sdk-6.0 \ && dnf clean all # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/tools/docker/test/fedora-33/dotnet.Dockerfile b/tools/docker/test/fedora-33/dotnet.Dockerfile deleted file mode 100644 index 2d87a0a5101..00000000000 --- a/tools/docker/test/fedora-33/dotnet.Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:33 - -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 gcc-c++ cmake \ -&& dnf clean all - -# Install .Net -# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora -RUN dnf -y update \ -&& dnf -y install dotnet-sdk-3.1 \ -&& dnf clean all -# Trigger first run experience by running arbitrary cmd -RUN dotnet --info - -# see: https://dotnet.microsoft.com/download/dotnet-core/6.0 -RUN dotnet_sdk_version=6.0.100 \ -&& wget -qO dotnet.tar.gz \ -"https://dotnetcli.azureedge.net/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-x64.tar.gz" \ -&& dotnet_sha512='cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b' \ -&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& tar -C /usr/lib64/dotnet -oxzf dotnet.tar.gz \ -&& rm dotnet.tar.gz -# Trigger first run experience by running arbitrary cmd -RUN dotnet --info - -WORKDIR /root -ADD or-tools_amd64_fedora-33_dotnet_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-33/java.Dockerfile b/tools/docker/test/fedora-33/java.Dockerfile deleted file mode 100644 index 8a535998375..00000000000 --- a/tools/docker/test/fedora-33/java.Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:33 - -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 gcc-c++ cmake \ -&& dnf clean all - -# Java Install -RUN dnf -y update \ -&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \ -&& dnf clean all -ENV JAVA_HOME=/usr/lib/jvm/java-openjdk - -WORKDIR /root -ADD or-tools_amd64_fedora-33_java_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-33/python.Dockerfile b/tools/docker/test/fedora-33/python.Dockerfile deleted file mode 100644 index 963d1136e66..00000000000 --- a/tools/docker/test/fedora-33/python.Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:33 - -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 gcc-c++ cmake \ -&& dnf clean all - -WORKDIR /root -ADD or-tools_amd64_fedora-33_python_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-34/cpp.Dockerfile b/tools/docker/test/fedora-34/cpp.Dockerfile deleted file mode 100644 index 19b6485cb8a..00000000000 --- a/tools/docker/test/fedora-34/cpp.Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:34 - -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 gcc-c++ cmake \ -&& dnf clean all - -WORKDIR /root -ADD or-tools_amd64_fedora-34_cpp_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-34/python.Dockerfile b/tools/docker/test/fedora-34/python.Dockerfile deleted file mode 100644 index a2594b2d012..00000000000 --- a/tools/docker/test/fedora-34/python.Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:34 - -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 gcc-c++ cmake \ -&& dnf clean all - -WORKDIR /root -ADD or-tools_amd64_fedora-34_python_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-35/cpp.Dockerfile b/tools/docker/test/fedora-35/cpp.Dockerfile deleted file mode 100644 index cb62a8c3f45..00000000000 --- a/tools/docker/test/fedora-35/cpp.Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:35 - -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 gcc-c++ cmake \ -&& dnf clean all - -WORKDIR /root -ADD or-tools_amd64_fedora-35_cpp_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-35/dotnet.Dockerfile b/tools/docker/test/fedora-35/dotnet.Dockerfile deleted file mode 100644 index b4e396a7907..00000000000 --- a/tools/docker/test/fedora-35/dotnet.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:35 - -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 gcc-c++ cmake \ -&& dnf clean all - -# Install .Net -# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora -RUN dnf -y update \ -&& dnf -y install dotnet-sdk-3.1 dotnet-sdk-6.0 \ -&& dnf clean all -# Trigger first run experience by running arbitrary cmd -RUN dotnet --info - -WORKDIR /root -ADD or-tools_amd64_fedora-35_dotnet_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-35/java.Dockerfile b/tools/docker/test/fedora-35/java.Dockerfile deleted file mode 100644 index 53779860a09..00000000000 --- a/tools/docker/test/fedora-35/java.Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:35 - -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 gcc-c++ cmake \ -&& dnf clean all - -# Java Install -RUN dnf -y update \ -&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \ -&& dnf clean all -ENV JAVA_HOME=/usr/lib/jvm/java-openjdk - -WORKDIR /root -ADD or-tools_amd64_fedora-35_java_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-36/cpp.Dockerfile b/tools/docker/test/fedora-36/cpp.Dockerfile deleted file mode 100644 index 22d346d8cf8..00000000000 --- a/tools/docker/test/fedora-36/cpp.Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:36 - -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 gcc-c++ cmake \ -&& dnf clean all - -WORKDIR /root -ADD or-tools_amd64_fedora-36_cpp_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-36/dotnet.Dockerfile b/tools/docker/test/fedora-36/dotnet.Dockerfile deleted file mode 100644 index 2065852eabd..00000000000 --- a/tools/docker/test/fedora-36/dotnet.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:36 - -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 gcc-c++ cmake \ -&& dnf clean all - -# Install .Net -# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora -RUN dnf -y update \ -&& dnf -y install dotnet-sdk-3.1 dotnet-sdk-6.0 \ -&& dnf clean all -# Trigger first run experience by running arbitrary cmd -RUN dotnet --info - -WORKDIR /root -ADD or-tools_amd64_fedora-36_dotnet_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-36/java.Dockerfile b/tools/docker/test/fedora-36/java.Dockerfile deleted file mode 100644 index 0bf87bc4039..00000000000 --- a/tools/docker/test/fedora-36/java.Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:36 - -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 gcc-c++ cmake \ -&& dnf clean all - -# Java Install -RUN dnf -y update \ -&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \ -&& dnf clean all -ENV JAVA_HOME=/usr/lib/jvm/java-openjdk - -WORKDIR /root -ADD or-tools_amd64_fedora-36_java_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-36/python.Dockerfile b/tools/docker/test/fedora-36/python.Dockerfile deleted file mode 100644 index d38be1802f6..00000000000 --- a/tools/docker/test/fedora-36/python.Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -# ref: https://hub.docker.com/_/fedora -FROM fedora:36 - -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 gcc-c++ cmake \ -&& dnf clean all - -WORKDIR /root -ADD or-tools_amd64_fedora-36_python_v*.tar.gz . - -RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-33/cpp.Dockerfile b/tools/docker/test/fedora-39/cpp.Dockerfile similarity index 83% rename from tools/docker/test/fedora-33/cpp.Dockerfile rename to tools/docker/test/fedora-39/cpp.Dockerfile index 63fd42cd016..c0155bcec39 100644 --- a/tools/docker/test/fedora-33/cpp.Dockerfile +++ b/tools/docker/test/fedora-39/cpp.Dockerfile @@ -1,5 +1,5 @@ # ref: https://hub.docker.com/_/fedora -FROM fedora:33 +FROM fedora:39 RUN dnf -y update \ && dnf -y install git \ @@ -9,6 +9,6 @@ RUN dnf -y update \ && dnf clean all WORKDIR /root -ADD or-tools_amd64_fedora-33_cpp_v*.tar.gz . +ADD or-tools_amd64_fedora-39_cpp_v*.tar.gz . RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-34/dotnet.Dockerfile b/tools/docker/test/fedora-39/dotnet.Dockerfile similarity index 89% rename from tools/docker/test/fedora-34/dotnet.Dockerfile rename to tools/docker/test/fedora-39/dotnet.Dockerfile index b1b1725d1d1..20297d0952b 100644 --- a/tools/docker/test/fedora-34/dotnet.Dockerfile +++ b/tools/docker/test/fedora-39/dotnet.Dockerfile @@ -1,5 +1,5 @@ # ref: https://hub.docker.com/_/fedora -FROM fedora:34 +FROM fedora:39 RUN dnf -y update \ && dnf -y install git \ @@ -17,6 +17,6 @@ RUN dnf -y update \ RUN dotnet --info WORKDIR /root -ADD or-tools_amd64_fedora-34_dotnet_v*.tar.gz . +ADD or-tools_amd64_fedora-39_dotnet_v*.tar.gz . RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-34/java.Dockerfile b/tools/docker/test/fedora-39/java.Dockerfile similarity index 88% rename from tools/docker/test/fedora-34/java.Dockerfile rename to tools/docker/test/fedora-39/java.Dockerfile index 3a9148c8a82..e6c9d996fc2 100644 --- a/tools/docker/test/fedora-34/java.Dockerfile +++ b/tools/docker/test/fedora-39/java.Dockerfile @@ -1,5 +1,5 @@ # ref: https://hub.docker.com/_/fedora -FROM fedora:34 +FROM fedora:39 RUN dnf -y update \ && dnf -y install git \ @@ -15,6 +15,6 @@ RUN dnf -y update \ ENV JAVA_HOME=/usr/lib/jvm/java-openjdk WORKDIR /root -ADD or-tools_amd64_fedora-34_java_v*.tar.gz . +ADD or-tools_amd64_fedora-39_java_v*.tar.gz . RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/fedora-35/python.Dockerfile b/tools/docker/test/fedora-39/python.Dockerfile similarity index 82% rename from tools/docker/test/fedora-35/python.Dockerfile rename to tools/docker/test/fedora-39/python.Dockerfile index 7854dd299d9..252bbb2de8a 100644 --- a/tools/docker/test/fedora-35/python.Dockerfile +++ b/tools/docker/test/fedora-39/python.Dockerfile @@ -1,5 +1,5 @@ # ref: https://hub.docker.com/_/fedora -FROM fedora:35 +FROM fedora:39 RUN dnf -y update \ && dnf -y install git \ @@ -9,6 +9,6 @@ RUN dnf -y update \ && dnf clean all WORKDIR /root -ADD or-tools_amd64_fedora-35_python_v*.tar.gz . +ADD or-tools_amd64_fedora-39_python_v*.tar.gz . RUN cd or-tools_*_v* && make test