From 32a3d098988ee7fc6140f1a9f242e947c9b9c6f9 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Wed, 8 Jun 2022 09:17:01 +0200 Subject: [PATCH] make(ci): Cleanup docker images --- makefiles/docker/alpine/dotnet.Dockerfile | 1 - makefiles/docker/archlinux/dotnet.Dockerfile | 5 ++--- makefiles/docker/centos/dotnet.Dockerfile | 1 - makefiles/docker/debian/dotnet.Dockerfile | 1 - makefiles/docker/fedora/dotnet.Dockerfile | 1 - makefiles/docker/opensuse/dotnet.Dockerfile | 1 - makefiles/docker/ubuntu/dotnet.Dockerfile | 7 +++---- 7 files changed, 5 insertions(+), 12 deletions(-) diff --git a/makefiles/docker/alpine/dotnet.Dockerfile b/makefiles/docker/alpine/dotnet.Dockerfile index d6fd0b470b..a520f9825c 100644 --- a/makefiles/docker/alpine/dotnet.Dockerfile +++ b/makefiles/docker/alpine/dotnet.Dockerfile @@ -33,7 +33,6 @@ WORKDIR /home/project COPY . . FROM devel AS build -RUN make third_party BUILD_DOTNET=ON BUILD_JAVA=OFF BUILD_PYTHON=OFF RUN make dotnet FROM build AS test diff --git a/makefiles/docker/archlinux/dotnet.Dockerfile b/makefiles/docker/archlinux/dotnet.Dockerfile index dee657d8c1..af8cab75b6 100644 --- a/makefiles/docker/archlinux/dotnet.Dockerfile +++ b/makefiles/docker/archlinux/dotnet.Dockerfile @@ -1,5 +1,5 @@ FROM ortools/make:archlinux_swig AS env -RUN pacman -Syu --noconfirm dotnet-sdk-3.1 dotnet-sdk +RUN pacman -Syu --noconfirm dotnet-sdk # Trigger first run experience by running arbitrary cmd RUN dotnet --info @@ -8,8 +8,7 @@ WORKDIR /home/project COPY . . FROM devel AS build -RUN make third_party BUILD_DOTNET=ON BUILD_JAVA=OFF BUILD_PYTHON=OFF -RUN make dotnet +RUN make dotnet CMAKE_ARGS="-DUSE_DOTNET_TFM_31=OFF" FROM build AS test RUN make test_dotnet diff --git a/makefiles/docker/centos/dotnet.Dockerfile b/makefiles/docker/centos/dotnet.Dockerfile index dd289d3f16..081eec4e44 100644 --- a/makefiles/docker/centos/dotnet.Dockerfile +++ b/makefiles/docker/centos/dotnet.Dockerfile @@ -13,7 +13,6 @@ WORKDIR /home/project COPY . . FROM devel AS build -RUN make third_party BUILD_DOTNET=ON BUILD_JAVA=OFF BUILD_PYTHON=OFF RUN make dotnet FROM build AS test diff --git a/makefiles/docker/debian/dotnet.Dockerfile b/makefiles/docker/debian/dotnet.Dockerfile index 440ec348f5..3aa70eadb9 100644 --- a/makefiles/docker/debian/dotnet.Dockerfile +++ b/makefiles/docker/debian/dotnet.Dockerfile @@ -17,7 +17,6 @@ WORKDIR /home/project COPY . . FROM devel AS build -RUN make third_party BUILD_DOTNET=ON BUILD_JAVA=OFF BUILD_PYTHON=OFF RUN make dotnet FROM build AS test diff --git a/makefiles/docker/fedora/dotnet.Dockerfile b/makefiles/docker/fedora/dotnet.Dockerfile index e2b7046b91..0bb5d9d182 100644 --- a/makefiles/docker/fedora/dotnet.Dockerfile +++ b/makefiles/docker/fedora/dotnet.Dockerfile @@ -12,7 +12,6 @@ WORKDIR /home/project COPY . . FROM devel AS build -RUN make third_party BUILD_DOTNET=ON BUILD_JAVA=OFF BUILD_PYTHON=OFF RUN make dotnet FROM build AS test diff --git a/makefiles/docker/opensuse/dotnet.Dockerfile b/makefiles/docker/opensuse/dotnet.Dockerfile index 527c0444bd..67f741c44e 100644 --- a/makefiles/docker/opensuse/dotnet.Dockerfile +++ b/makefiles/docker/opensuse/dotnet.Dockerfile @@ -33,7 +33,6 @@ WORKDIR /home/project COPY . . FROM devel AS build -RUN make third_party BUILD_DOTNET=ON BUILD_JAVA=OFF BUILD_PYTHON=OFF RUN make dotnet FROM build AS test diff --git a/makefiles/docker/ubuntu/dotnet.Dockerfile b/makefiles/docker/ubuntu/dotnet.Dockerfile index 0cd4c976b6..c185c8ad7c 100644 --- a/makefiles/docker/ubuntu/dotnet.Dockerfile +++ b/makefiles/docker/ubuntu/dotnet.Dockerfile @@ -2,10 +2,10 @@ FROM ortools/make:ubuntu_swig AS env # see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-ubuntu RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq wget apt-transport-https \ -&& wget -q https://packages.microsoft.com/config/ubuntu/21.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ +&& wget -q https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && apt-get update -qq \ -&& DEBIAN_FRONTEND=noninteractive apt-get install -yq dotnet-sdk-3.1 dotnet-sdk-6.0\ +&& DEBIAN_FRONTEND=noninteractive apt-get install -yq dotnet-sdk-6.0 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Trigger first run experience by running arbitrary cmd @@ -16,8 +16,7 @@ WORKDIR /home/project COPY . . FROM devel AS build -RUN make third_party BUILD_DOTNET=ON BUILD_JAVA=OFF BUILD_PYTHON=OFF -RUN make dotnet +RUN make dotnet CMAKE_ARGS="-DUSE_DOTNET_TFM_31=OFF" FROM build AS test RUN make test_dotnet