From 3f1c25218a1e692de8e1bbfef4d76b048d93428a Mon Sep 17 00:00:00 2001
From: secwall <secwall@yandex-team.ru>
Date: Wed, 27 Nov 2024 16:05:23 +0100
Subject: [PATCH] Bump ubuntu version in CI

---
 .github/workflows/func-tests.yml            | 6 +++---
 .github/workflows/golangci-lint.yml         | 2 +-
 .github/workflows/jepsen-cluster-tests.yml  | 2 +-
 .github/workflows/jepsen-sentinel-tests.yml | 2 +-
 .github/workflows/unit-tests.yml            | 2 +-
 Makefile                                    | 2 +-
 tests/images/base/Dockerfile                | 2 +-
 tests/images/base/setup.sh                  | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/func-tests.yml b/.github/workflows/func-tests.yml
index 055088a..cc1ba97 100644
--- a/.github/workflows/func-tests.yml
+++ b/.github/workflows/func-tests.yml
@@ -10,12 +10,12 @@ on:
 
 env:
   GO_VERSION: 1.23.3
-  DOCKER_API_VERSION: 1.43
+  DOCKER_API_VERSION: 1.45
 
 jobs:
   prepare:
     name: Prepare
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
@@ -62,7 +62,7 @@ jobs:
 
   test:
     name: Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [ prepare ]
     strategy:
       matrix:
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 69a6e2e..bc79305 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -15,7 +15,7 @@ permissions:
 jobs:
   golangci:
     name: lint
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/setup-go@v5
         with:
diff --git a/.github/workflows/jepsen-cluster-tests.yml b/.github/workflows/jepsen-cluster-tests.yml
index 6313a2a..e585f45 100644
--- a/.github/workflows/jepsen-cluster-tests.yml
+++ b/.github/workflows/jepsen-cluster-tests.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Set up Go 1.x
         uses: actions/setup-go@v5
diff --git a/.github/workflows/jepsen-sentinel-tests.yml b/.github/workflows/jepsen-sentinel-tests.yml
index b081eee..7fe98af 100644
--- a/.github/workflows/jepsen-sentinel-tests.yml
+++ b/.github/workflows/jepsen-sentinel-tests.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Set up Go 1.x
         uses: actions/setup-go@v5
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 9b8349c..7a92be0 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   unittest:
     name: all_unittests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Set up Go 1.x
         uses: actions/setup-go@v5
diff --git a/Makefile b/Makefile
index 633c616..61e5d3f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ unittests:
 	go test ./cmd/... ./tests/testutil/matchers/
 
 redis/src/redis-server:
-	docker run --rm -v ${CURDIR}:/app -w /app ubuntu:jammy /app/redis_patches/build.sh
+	docker run --rm -v ${CURDIR}:/app -w /app ubuntu:noble /app/redis_patches/build.sh
 
 test: base_image redis/src/redis-server cmd/rdsync/rdsync recreate_logs
 	rm -rf ./tests/images/redis/rdsync && cp cmd/rdsync/rdsync ./tests/images/redis/rdsync
diff --git a/tests/images/base/Dockerfile b/tests/images/base/Dockerfile
index ebef359..9823fe1 100644
--- a/tests/images/base/Dockerfile
+++ b/tests/images/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:noble
 ENV container docker
 ENV DEBIAN_FRONTEND noninteractive
 COPY . /var/lib/dist/base
diff --git a/tests/images/base/setup.sh b/tests/images/base/setup.sh
index a51143c..50a1463 100755
--- a/tests/images/base/setup.sh
+++ b/tests/images/base/setup.sh
@@ -25,7 +25,7 @@ apt install less \
     faketime \
     iptables \
     openssl \
-    netcat
+    netcat-traditional
 
 rm -rf /var/run
 ln -s /dev/shm /var/run