make(ci): Cleanup docker images

This commit is contained in:
Corentin Le Molgat
2022-06-08 09:17:01 +02:00
parent 0003ef7474
commit 32a3d09898
7 changed files with 5 additions and 12 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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