From 6d2fc347559143ede7405a3be4cfa14ddcb26a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= <raulcumplido@gmail.com>
Date: Tue, 21 Mar 2023 16:36:45 +0100
Subject: [PATCH] GH-34661: [CI][C#] Update Ubuntu C# jobs to use image with
 .NET 7.0

---
 .env                                                      | 2 +-
 ...4-csharp.dockerfile => ubuntu-22.04-csharp.dockerfile} | 2 +-
 docker-compose.yml                                        | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename ci/docker/{ubuntu-20.04-csharp.dockerfile => ubuntu-22.04-csharp.dockerfile} (98%)

diff --git a/.env b/.env
index d93eab06ffb07..cf4d730f705c5 100644
--- a/.env
+++ b/.env
@@ -56,7 +56,7 @@ UBUNTU=20.04
 CLANG_TOOLS=14
 CUDA=11.0.3
 DASK=latest
-DOTNET=6.0
+DOTNET=7.0
 GCC_VERSION=""
 GO=1.17
 STATICCHECK=v0.2.2
diff --git a/ci/docker/ubuntu-20.04-csharp.dockerfile b/ci/docker/ubuntu-22.04-csharp.dockerfile
similarity index 98%
rename from ci/docker/ubuntu-20.04-csharp.dockerfile
rename to ci/docker/ubuntu-22.04-csharp.dockerfile
index 88fe789121905..3b08894d2ddbe 100644
--- a/ci/docker/ubuntu-20.04-csharp.dockerfile
+++ b/ci/docker/ubuntu-22.04-csharp.dockerfile
@@ -17,7 +17,7 @@
 
 ARG arch=amd64
 ARG dotnet=7.0
-ARG platform=focal
+ARG platform=jammy
 FROM mcr.microsoft.com/dotnet/sdk:${dotnet}-${platform}-${arch}
 
 RUN dotnet tool install --tool-path /usr/local/bin sourcelink
diff --git a/docker-compose.yml b/docker-compose.yml
index c9b02c45d1c5d..1914b50c64d40 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1538,16 +1538,16 @@ services:
     # Usage:
     #   docker-compose build ubuntu-csharp
     #   docker-compose run ubuntu-csharp
-    image: ${REPO}:${ARCH}-ubuntu-20.04-csharp-${DOTNET}
+    image: ${REPO}:${ARCH}-ubuntu-22.04-csharp-${DOTNET}
     build:
       context: .
-      dockerfile: ci/docker/ubuntu-20.04-csharp.dockerfile
+      dockerfile: ci/docker/ubuntu-22.04-csharp.dockerfile
       cache_from:
-        - ${REPO}:${ARCH}-ubuntu-20.04-csharp-${DOTNET}
+        - ${REPO}:${ARCH}-ubuntu-22.04-csharp-${DOTNET}
       args:
         arch: ${ARCH}
         dotnet: ${DOTNET}
-        platform: focal
+        platform: jammy
     shm_size: *shm-size
     volumes: *ubuntu-volumes
     command: &csharp-command >