From ddaaab1c665423fc3eff428cfa7d45b636d0cd7c Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 22 Jul 2024 13:53:01 +0200 Subject: [PATCH] docker: Format fix --- cmake/docker/almalinux/cpp.Dockerfile | 1 + cmake/docker/almalinux/dotnet.Dockerfile | 1 + cmake/docker/almalinux/java.Dockerfile | 1 + cmake/docker/almalinux/python.Dockerfile | 1 + cmake/docker/alpine/cpp.Dockerfile | 1 + cmake/docker/alpine/java.Dockerfile | 1 + cmake/docker/alpine/python.Dockerfile | 1 + cmake/docker/archlinux/cpp.Dockerfile | 1 + cmake/docker/archlinux/dotnet.Dockerfile | 1 + cmake/docker/archlinux/java.Dockerfile | 1 + cmake/docker/archlinux/python.Dockerfile | 1 + cmake/docker/debian/cpp.Dockerfile | 1 + cmake/docker/debian/dotnet.Dockerfile | 1 + cmake/docker/debian/java.Dockerfile | 1 + cmake/docker/debian/python.Dockerfile | 1 + cmake/docker/fedora/cpp.Dockerfile | 1 + cmake/docker/fedora/java.Dockerfile | 1 + cmake/docker/fedora/python.Dockerfile | 1 + cmake/docker/glop/Dockerfile | 1 + cmake/docker/opensuse/cpp.Dockerfile | 1 + cmake/docker/opensuse/dotnet.Dockerfile | 1 - cmake/docker/opensuse/java.Dockerfile | 1 + cmake/docker/opensuse/python.Dockerfile | 1 + cmake/docker/rockylinux/cpp.Dockerfile | 1 + cmake/docker/rockylinux/dotnet.Dockerfile | 1 + cmake/docker/rockylinux/java.Dockerfile | 1 + cmake/docker/rockylinux/python.Dockerfile | 1 + cmake/docker/system_deps/cpp.Dockerfile | 1 + cmake/docker/system_deps/dotnet.Dockerfile | 1 + cmake/docker/system_deps/java.Dockerfile | 1 + cmake/docker/system_deps/python.Dockerfile | 1 + cmake/docker/toolchain/Dockerfile | 1 + cmake/docker/ubuntu/cpp.Dockerfile | 1 + cmake/docker/ubuntu/java.Dockerfile | 1 + cmake/docker/ubuntu/python.Dockerfile | 1 + cmake/docker/web/Dockerfile | 1 + tools/docker/python/amd64/alpine.Dockerfile | 1 + tools/docker/python/arm64v8/alpine.Dockerfile | 1 + 38 files changed, 37 insertions(+), 1 deletion(-) diff --git a/cmake/docker/almalinux/cpp.Dockerfile b/cmake/docker/almalinux/cpp.Dockerfile index d98d1b4220..f8043394bf 100644 --- a/cmake/docker/almalinux/cpp.Dockerfile +++ b/cmake/docker/almalinux/cpp.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:almalinux_base AS env + RUN cmake -version FROM env AS devel diff --git a/cmake/docker/almalinux/dotnet.Dockerfile b/cmake/docker/almalinux/dotnet.Dockerfile index f5b9c11404..3979577eb2 100644 --- a/cmake/docker/almalinux/dotnet.Dockerfile +++ b/cmake/docker/almalinux/dotnet.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:almalinux_swig AS env + # Install .NET SDK # see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install RUN wget -q "https://dot.net/v1/dotnet-install.sh" \ diff --git a/cmake/docker/almalinux/java.Dockerfile b/cmake/docker/almalinux/java.Dockerfile index 41d38ec708..73b0d9cde8 100644 --- a/cmake/docker/almalinux/java.Dockerfile +++ b/cmake/docker/almalinux/java.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:almalinux_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 \ diff --git a/cmake/docker/almalinux/python.Dockerfile b/cmake/docker/almalinux/python.Dockerfile index 5105f27c7b..5bbd43dbae 100644 --- a/cmake/docker/almalinux/python.Dockerfile +++ b/cmake/docker/almalinux/python.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:almalinux_swig AS env + ENV PATH=/root/.local/bin:$PATH RUN dnf -y update \ && dnf -y install python3-devel python3-pip python3-numpy \ diff --git a/cmake/docker/alpine/cpp.Dockerfile b/cmake/docker/alpine/cpp.Dockerfile index 44ace7b16f..5eef81dd52 100644 --- a/cmake/docker/alpine/cpp.Dockerfile +++ b/cmake/docker/alpine/cpp.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:alpine_base AS env + RUN cmake -version FROM env AS devel diff --git a/cmake/docker/alpine/java.Dockerfile b/cmake/docker/alpine/java.Dockerfile index 11852b2fd8..d04b74ee15 100644 --- a/cmake/docker/alpine/java.Dockerfile +++ b/cmake/docker/alpine/java.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:alpine_swig AS env + ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk RUN apk add --no-cache openjdk8 maven diff --git a/cmake/docker/alpine/python.Dockerfile b/cmake/docker/alpine/python.Dockerfile index 2fc34f7af3..93d5e7edf9 100644 --- a/cmake/docker/alpine/python.Dockerfile +++ b/cmake/docker/alpine/python.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:alpine_swig AS env + ENV PATH=/root/.local/bin:$PATH RUN apk add --no-cache python3-dev py3-pip py3-wheel \ py3-numpy py3-pandas py3-matplotlib py3-scipy diff --git a/cmake/docker/archlinux/cpp.Dockerfile b/cmake/docker/archlinux/cpp.Dockerfile index 7d33ce536b..785754457b 100644 --- a/cmake/docker/archlinux/cpp.Dockerfile +++ b/cmake/docker/archlinux/cpp.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:archlinux_base AS env + RUN cmake -version FROM env AS devel diff --git a/cmake/docker/archlinux/dotnet.Dockerfile b/cmake/docker/archlinux/dotnet.Dockerfile index 1e5e540cb5..669139907b 100644 --- a/cmake/docker/archlinux/dotnet.Dockerfile +++ b/cmake/docker/archlinux/dotnet.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:archlinux_swig AS env + RUN pacman -Syu --noconfirm dotnet-sdk # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/cmake/docker/archlinux/java.Dockerfile b/cmake/docker/archlinux/java.Dockerfile index cb313a3596..8fb70b144d 100644 --- a/cmake/docker/archlinux/java.Dockerfile +++ b/cmake/docker/archlinux/java.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:archlinux_swig AS env + RUN pacman -Syu --noconfirm jdk-openjdk maven ENV JAVA_HOME=/usr/lib/jvm/default diff --git a/cmake/docker/archlinux/python.Dockerfile b/cmake/docker/archlinux/python.Dockerfile index e79279ad17..ab6e85e0ec 100644 --- a/cmake/docker/archlinux/python.Dockerfile +++ b/cmake/docker/archlinux/python.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:archlinux_swig AS env + ENV PATH=/root/.local/bin:$PATH RUN pacman -Syu --noconfirm python python-pip \ python-wheel python-virtualenv python-setuptools \ diff --git a/cmake/docker/debian/cpp.Dockerfile b/cmake/docker/debian/cpp.Dockerfile index 73f35672c3..8e9c1a78f7 100644 --- a/cmake/docker/debian/cpp.Dockerfile +++ b/cmake/docker/debian/cpp.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:debian_base AS env + RUN cmake -version FROM env AS devel diff --git a/cmake/docker/debian/dotnet.Dockerfile b/cmake/docker/debian/dotnet.Dockerfile index 55a421dee1..79b958264d 100644 --- a/cmake/docker/debian/dotnet.Dockerfile +++ b/cmake/docker/debian/dotnet.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:debian_swig AS env + # see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian RUN apt-get update -qq \ && apt-get install -yq wget gpg apt-transport-https \ diff --git a/cmake/docker/debian/java.Dockerfile b/cmake/docker/debian/java.Dockerfile index 300ec5364b..40d2268ada 100644 --- a/cmake/docker/debian/java.Dockerfile +++ b/cmake/docker/debian/java.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:debian_swig AS env + RUN apt-get update -qq \ && apt-get install -yq default-jdk maven \ && apt-get clean \ diff --git a/cmake/docker/debian/python.Dockerfile b/cmake/docker/debian/python.Dockerfile index 010703a184..a8b75b25c8 100644 --- a/cmake/docker/debian/python.Dockerfile +++ b/cmake/docker/debian/python.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:debian_swig AS env + ENV PATH=/root/.local/bin:$PATH RUN apt-get update -qq \ && apt-get install -yq \ diff --git a/cmake/docker/fedora/cpp.Dockerfile b/cmake/docker/fedora/cpp.Dockerfile index 873c5da1d0..dcefd24c5d 100644 --- a/cmake/docker/fedora/cpp.Dockerfile +++ b/cmake/docker/fedora/cpp.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:fedora_base AS env + RUN cmake -version FROM env AS devel diff --git a/cmake/docker/fedora/java.Dockerfile b/cmake/docker/fedora/java.Dockerfile index ae8cf08f66..62ef7b3461 100644 --- a/cmake/docker/fedora/java.Dockerfile +++ b/cmake/docker/fedora/java.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:fedora_swig AS env + RUN dnf -y update \ && dnf -y install java-11-openjdk java-11-openjdk-devel maven \ && dnf clean all diff --git a/cmake/docker/fedora/python.Dockerfile b/cmake/docker/fedora/python.Dockerfile index 59d33f1c7f..9c0bc135f8 100644 --- a/cmake/docker/fedora/python.Dockerfile +++ b/cmake/docker/fedora/python.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:fedora_swig AS env + ENV PATH=/root/.local/bin:$PATH RUN dnf -y update \ && dnf -y install python3 python3-devel python3-pip \ diff --git a/cmake/docker/glop/Dockerfile b/cmake/docker/glop/Dockerfile index 067037b064..bbd1e2d31d 100644 --- a/cmake/docker/glop/Dockerfile +++ b/cmake/docker/glop/Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/_/ubuntu FROM ubuntu:rolling AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN apt-get update -qq \ diff --git a/cmake/docker/opensuse/cpp.Dockerfile b/cmake/docker/opensuse/cpp.Dockerfile index 7a31d94c77..20d89e1f75 100644 --- a/cmake/docker/opensuse/cpp.Dockerfile +++ b/cmake/docker/opensuse/cpp.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:opensuse_base AS env + RUN cmake -version FROM env AS devel diff --git a/cmake/docker/opensuse/dotnet.Dockerfile b/cmake/docker/opensuse/dotnet.Dockerfile index a18803b92e..8dcdf9ed4b 100644 --- a/cmake/docker/opensuse/dotnet.Dockerfile +++ b/cmake/docker/opensuse/dotnet.Dockerfile @@ -1,5 +1,4 @@ FROM ortools/cmake:opensuse_swig AS env -# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-opensuse # .NET install # see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-opensuse diff --git a/cmake/docker/opensuse/java.Dockerfile b/cmake/docker/opensuse/java.Dockerfile index 718e2643f5..0d728bf72e 100644 --- a/cmake/docker/opensuse/java.Dockerfile +++ b/cmake/docker/opensuse/java.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:opensuse_swig AS env + # Install Java JDK and Maven RUN zypper refresh \ && zypper install -y java-17-openjdk-devel maven \ diff --git a/cmake/docker/opensuse/python.Dockerfile b/cmake/docker/opensuse/python.Dockerfile index 95c1fdaa44..308c08bcab 100644 --- a/cmake/docker/opensuse/python.Dockerfile +++ b/cmake/docker/opensuse/python.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:opensuse_swig AS env + ENV PATH=/root/.local/bin:$PATH RUN zypper refresh \ && zypper install -y python311 python311-devel \ diff --git a/cmake/docker/rockylinux/cpp.Dockerfile b/cmake/docker/rockylinux/cpp.Dockerfile index b17e3c0da4..959ca4236d 100644 --- a/cmake/docker/rockylinux/cpp.Dockerfile +++ b/cmake/docker/rockylinux/cpp.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:rockylinux_base AS env + RUN cmake -version FROM env AS devel diff --git a/cmake/docker/rockylinux/dotnet.Dockerfile b/cmake/docker/rockylinux/dotnet.Dockerfile index 16d075fdfe..c973a59f2f 100644 --- a/cmake/docker/rockylinux/dotnet.Dockerfile +++ b/cmake/docker/rockylinux/dotnet.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:rockylinux_swig AS env + # Install .NET SDK # see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install RUN wget -q "https://dot.net/v1/dotnet-install.sh" \ diff --git a/cmake/docker/rockylinux/java.Dockerfile b/cmake/docker/rockylinux/java.Dockerfile index 602bf2c42e..957033eafa 100644 --- a/cmake/docker/rockylinux/java.Dockerfile +++ b/cmake/docker/rockylinux/java.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:rockylinux_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 \ diff --git a/cmake/docker/rockylinux/python.Dockerfile b/cmake/docker/rockylinux/python.Dockerfile index 269b43e664..ada23577b1 100644 --- a/cmake/docker/rockylinux/python.Dockerfile +++ b/cmake/docker/rockylinux/python.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:rockylinux_swig AS env + ENV PATH=/root/.local/bin:$PATH RUN dnf -y update \ && dnf -y install python3-devel python3-pip python3-numpy \ diff --git a/cmake/docker/system_deps/cpp.Dockerfile b/cmake/docker/system_deps/cpp.Dockerfile index 77b34fa5aa..f0845f9746 100644 --- a/cmake/docker/system_deps/cpp.Dockerfile +++ b/cmake/docker/system_deps/cpp.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:system_deps_base AS env + RUN cmake -version FROM env AS devel diff --git a/cmake/docker/system_deps/dotnet.Dockerfile b/cmake/docker/system_deps/dotnet.Dockerfile index 96b754ef68..28f8e0a39c 100644 --- a/cmake/docker/system_deps/dotnet.Dockerfile +++ b/cmake/docker/system_deps/dotnet.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:system_deps_swig AS env + RUN pacman -Syu --noconfirm dotnet-sdk # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/cmake/docker/system_deps/java.Dockerfile b/cmake/docker/system_deps/java.Dockerfile index 5c430948d2..ff39de3701 100644 --- a/cmake/docker/system_deps/java.Dockerfile +++ b/cmake/docker/system_deps/java.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:system_deps_swig AS env + RUN pacman -Syu --noconfirm jdk-openjdk maven ENV JAVA_HOME=/usr/lib/jvm/default diff --git a/cmake/docker/system_deps/python.Dockerfile b/cmake/docker/system_deps/python.Dockerfile index e5db904d91..a09157885a 100644 --- a/cmake/docker/system_deps/python.Dockerfile +++ b/cmake/docker/system_deps/python.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:system_deps_swig AS env + ENV PATH=/root/.local/bin:$PATH RUN pacman -Syu --noconfirm pybind11 RUN pacman -Syu --noconfirm python \ diff --git a/cmake/docker/toolchain/Dockerfile b/cmake/docker/toolchain/Dockerfile index 7e738befd9..7e16dceb4e 100644 --- a/cmake/docker/toolchain/Dockerfile +++ b/cmake/docker/toolchain/Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/_/ubuntu FROM ubuntu:latest AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN apt-get update -qq \ diff --git a/cmake/docker/ubuntu/cpp.Dockerfile b/cmake/docker/ubuntu/cpp.Dockerfile index 4706ffabff..31822b5856 100644 --- a/cmake/docker/ubuntu/cpp.Dockerfile +++ b/cmake/docker/ubuntu/cpp.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:ubuntu_base AS env + RUN cmake -version FROM env AS devel diff --git a/cmake/docker/ubuntu/java.Dockerfile b/cmake/docker/ubuntu/java.Dockerfile index 35899666b0..994c1900ef 100644 --- a/cmake/docker/ubuntu/java.Dockerfile +++ b/cmake/docker/ubuntu/java.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:ubuntu_swig AS env + RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq default-jdk maven \ && apt-get clean \ diff --git a/cmake/docker/ubuntu/python.Dockerfile b/cmake/docker/ubuntu/python.Dockerfile index b6d1cb1a5a..fa4571c597 100644 --- a/cmake/docker/ubuntu/python.Dockerfile +++ b/cmake/docker/ubuntu/python.Dockerfile @@ -1,4 +1,5 @@ FROM ortools/cmake:ubuntu_swig AS env + ENV PATH=/root/.local/bin:$PATH RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq \ diff --git a/cmake/docker/web/Dockerfile b/cmake/docker/web/Dockerfile index b74b8e13aa..1ebec3a45c 100644 --- a/cmake/docker/web/Dockerfile +++ b/cmake/docker/web/Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/_/archlinux/ FROM archlinux:latest AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN pacman -Syu --noconfirm git base-devel cmake diff --git a/tools/docker/python/amd64/alpine.Dockerfile b/tools/docker/python/amd64/alpine.Dockerfile index 698c290682..b1158dbb3a 100644 --- a/tools/docker/python/amd64/alpine.Dockerfile +++ b/tools/docker/python/amd64/alpine.Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/_/alpine FROM alpine:edge AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN apk add --no-cache git build-base linux-headers cmake xfce4-dev-tools diff --git a/tools/docker/python/arm64v8/alpine.Dockerfile b/tools/docker/python/arm64v8/alpine.Dockerfile index 1ae0f119aa..4a8dbfc96a 100644 --- a/tools/docker/python/arm64v8/alpine.Dockerfile +++ b/tools/docker/python/arm64v8/alpine.Dockerfile @@ -1,6 +1,7 @@ # Create a virtual environment with all tools installed # ref: https://hub.docker.com/_/alpine FROM arm64v8/alpine:edge AS env + # Install system build dependencies ENV PATH=/usr/local/bin:$PATH RUN apk add --no-cache git build-base linux-headers cmake xfce4-dev-tools