From a3b6173ca61e4df1eeaab398bbce4e88af685e05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Aug 2024 17:52:14 +0200
Subject: [PATCH 1/3] chore(deps): bump github/codeql-action from 3.24.9 to
 3.25.15 (#2677)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.9 to 3.25.15.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/1b1aada464948af03b950897e5eb522f92603cc2...afb54ba388a7dca6ecae48f608c4ff05ff4cc77a)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql.yml     | 6 +++---
 .github/workflows/scorecards.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 8919663257..5952e14d60 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -53,7 +53,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+      uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -67,7 +67,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+      uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -80,6 +80,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+      uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 73c657d3c4..d8b8174403 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -51,6 +51,6 @@ jobs:
 
       # required for Code scanning alerts
       - name: "Upload SARIF results to code scanning"
-        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           sarif_file: results.sarif

From 3682745d59deb5bc3168f6a60eece12a0a20442e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 23 Aug 2024 14:34:59 +0200
Subject: [PATCH 2/3] chore(deps): bump minimal Go version from 1.21 to 1.22
 (#2743)

* fix: update devcontainer image

Caused by #2531

* chore: bump minimal Go version to 1.22
---
 .devcontainer/devcontainer.json              |  2 +-
 .github/workflows/ci.yml                     | 12 ++++++------
 docs/system_requirements/ci/aws_codebuild.md |  2 +-
 docs/system_requirements/ci/concourse_ci.md  |  2 +-
 docs/system_requirements/ci/dind_patterns.md |  4 ++--
 docs/system_requirements/ci/gitlab_ci.md     |  2 +-
 docs/system_requirements/ci/tekton.md        |  2 +-
 docs/system_requirements/ci/travis.md        |  2 +-
 examples/nginx/go.mod                        |  2 +-
 examples/toxiproxy/go.mod                    |  2 +-
 go.mod                                       |  2 +-
 modulegen/_template/ci.yml.tmpl              | 12 ++++++------
 modulegen/go.mod                             |  2 +-
 modules/artemis/go.mod                       |  2 +-
 modules/azurite/go.mod                       |  2 +-
 modules/cassandra/go.mod                     |  2 +-
 modules/chroma/go.mod                        |  2 +-
 modules/clickhouse/go.mod                    |  2 +-
 modules/cockroachdb/go.mod                   |  2 +-
 modules/compose/go.mod                       |  2 +-
 modules/consul/go.mod                        |  2 +-
 modules/couchbase/go.mod                     |  2 +-
 modules/dolt/go.mod                          |  2 +-
 modules/elasticsearch/go.mod                 |  2 +-
 modules/gcloud/go.mod                        |  2 +-
 modules/grafana-lgtm/go.mod                  |  2 +-
 modules/inbucket/go.mod                      |  2 +-
 modules/influxdb/go.mod                      |  2 +-
 modules/k3s/go.mod                           |  2 +-
 modules/k6/go.mod                            |  2 +-
 modules/kafka/go.mod                         |  2 +-
 modules/localstack/go.mod                    |  2 +-
 modules/mariadb/go.mod                       |  2 +-
 modules/milvus/go.mod                        |  2 +-
 modules/minio/go.mod                         |  2 +-
 modules/mockserver/go.mod                    |  2 +-
 modules/mongodb/go.mod                       |  2 +-
 modules/mssql/go.mod                         |  2 +-
 modules/mysql/go.mod                         |  2 +-
 modules/nats/go.mod                          |  2 +-
 modules/neo4j/go.mod                         |  2 +-
 modules/ollama/go.mod                        |  2 +-
 modules/openfga/go.mod                       |  2 +-
 modules/openldap/go.mod                      |  2 +-
 modules/opensearch/go.mod                    |  2 +-
 modules/postgres/go.mod                      |  2 +-
 modules/pulsar/go.mod                        |  2 +-
 modules/qdrant/go.mod                        |  2 +-
 modules/rabbitmq/go.mod                      |  2 +-
 modules/redis/go.mod                         |  2 +-
 modules/redpanda/go.mod                      |  2 +-
 modules/registry/go.mod                      |  2 +-
 modules/surrealdb/go.mod                     |  2 +-
 modules/valkey/go.mod                        |  2 +-
 modules/vault/go.mod                         |  2 +-
 modules/weaviate/go.mod                      |  2 +-
 scripts/bump-go.sh                           |  2 +-
 wait/testdata/go.mod                         |  2 +-
 58 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 731826913c..5952d31d52 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/go
 {
 	"name": "Go",
-	"image": "mcr.microsoft.com/devcontainers/go:1.21-bookworm",
+	"image": "mcr.microsoft.com/devcontainers/go:1.22-bookworm",
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5ca90727cb..a7f48d18dd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.21.x, 1.x]
+        go-version: [1.22.x, 1.x]
         platform: [ubuntu-latest, macos-latest]
     uses: ./.github/workflows/ci-test-go.yml
     with:
@@ -44,7 +44,7 @@ jobs:
     name: "Test with reaper off"
     strategy:
       matrix:
-        go-version: [1.21.x, 1.x]
+        go-version: [1.22.x, 1.x]
     uses: ./.github/workflows/ci-test-go.yml
     with:
       go-version: ${{ matrix.go-version }}
@@ -61,7 +61,7 @@ jobs:
     name: "Test with Rootless Docker"
     strategy:
       matrix:
-        go-version: [1.21.x, 1.x]
+        go-version: [1.22.x, 1.x]
         platform: [ubuntu-latest]
     uses: ./.github/workflows/ci-test-go.yml
     with:
@@ -76,7 +76,7 @@ jobs:
   test-module-generator:
     strategy:
       matrix:
-        go-version: [1.21.x, 1.x]
+        go-version: [1.22.x, 1.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     uses: ./.github/workflows/ci-test-go.yml
     with:
@@ -92,7 +92,7 @@ jobs:
     needs: test
     strategy:
       matrix:
-        go-version: [1.21.x, 1.x]
+        go-version: [1.22.x, 1.x]
         platform: [ubuntu-latest]
         module: [artemis, azurite, cassandra, chroma, clickhouse, cockroachdb, compose, consul, couchbase, dolt, elasticsearch, gcloud, grafana-lgtm, inbucket, influxdb, k3s, k6, kafka, localstack, mariadb, milvus, minio, mockserver, mongodb, mssql, mysql, nats, neo4j, ollama, openfga, openldap, opensearch, postgres, pulsar, qdrant, rabbitmq, redis, redpanda, registry, surrealdb, valkey, vault, vearch, weaviate]
     uses: ./.github/workflows/ci-test-go.yml
@@ -112,7 +112,7 @@ jobs:
         module: [nginx, toxiproxy]
     uses: ./.github/workflows/ci-test-go.yml
     with:
-      go-version: "1.21.x"
+      go-version: "1.22.x"
       fail-fast: true
       platform: 'ubuntu-latest'
       project-directory: examples/${{ matrix.module }}
diff --git a/docs/system_requirements/ci/aws_codebuild.md b/docs/system_requirements/ci/aws_codebuild.md
index 1320e6bdba..a64d3691e0 100644
--- a/docs/system_requirements/ci/aws_codebuild.md
+++ b/docs/system_requirements/ci/aws_codebuild.md
@@ -11,7 +11,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      golang: 1.21
+      golang: 1.22
   build:
     commands:
       - go test ./...
diff --git a/docs/system_requirements/ci/concourse_ci.md b/docs/system_requirements/ci/concourse_ci.md
index 2d711d3b73..ede2aac2ae 100644
--- a/docs/system_requirements/ci/concourse_ci.md
+++ b/docs/system_requirements/ci/concourse_ci.md
@@ -36,7 +36,7 @@ jobs:
             start_docker
 
             cd repo
-            docker run -it --rm -v "$PWD:$PWD" -w "$PWD" -v /var/run/docker.sock:/var/run/docker.sock golang:1.21 go test ./...
+            docker run -it --rm -v "$PWD:$PWD" -w "$PWD" -v /var/run/docker.sock:/var/run/docker.sock golang:1.22 go test ./...
 ```
 
 Finally, you can use Concourse's [fly CLI](https://concourse-ci.org/fly.html) to set the pipeline and trigger the job:
diff --git a/docs/system_requirements/ci/dind_patterns.md b/docs/system_requirements/ci/dind_patterns.md
index 853a174d32..267a4baaf5 100644
--- a/docs/system_requirements/ci/dind_patterns.md
+++ b/docs/system_requirements/ci/dind_patterns.md
@@ -24,7 +24,7 @@ $ tree .
 └── platform
     └── integration_test.go
 
-$ docker run -it --rm -v $PWD:$PWD -w $PWD -v /var/run/docker.sock:/var/run/docker.sock golang:1.21 go test ./... -v
+$ docker run -it --rm -v $PWD:$PWD -w $PWD -v /var/run/docker.sock:/var/run/docker.sock golang:1.22 go test ./... -v
 ```
 
 Where:
@@ -45,7 +45,7 @@ The same can be achieved with Docker Compose:
 
 ```yaml
 tests:
-  image: golang:1.21
+  image: golang:1.22
   stop_signal: SIGKILL
   stdin_open: true
   tty: true
diff --git a/docs/system_requirements/ci/gitlab_ci.md b/docs/system_requirements/ci/gitlab_ci.md
index 6289dc59ae..679292a010 100644
--- a/docs/system_requirements/ci/gitlab_ci.md
+++ b/docs/system_requirements/ci/gitlab_ci.md
@@ -57,7 +57,7 @@ variables:
   DOCKER_DRIVER: overlay2
 
 test:
- image: golang:1.21
+ image: golang:1.22
  stage: test
  script: go test ./... -v
 ```
diff --git a/docs/system_requirements/ci/tekton.md b/docs/system_requirements/ci/tekton.md
index a8280a0802..28f23f77fb 100644
--- a/docs/system_requirements/ci/tekton.md
+++ b/docs/system_requirements/ci/tekton.md
@@ -16,7 +16,7 @@ spec:
     - name: source
   steps:
     - name: read
-      image: golang:1.21
+      image: golang:1.22
       workingDir: $(workspaces.source.path)
       script: go test ./... -v
       volumeMounts:
diff --git a/docs/system_requirements/ci/travis.md b/docs/system_requirements/ci/travis.md
index 0701d2e367..bfc81c303d 100644
--- a/docs/system_requirements/ci/travis.md
+++ b/docs/system_requirements/ci/travis.md
@@ -7,7 +7,7 @@ is the minimal required config.
 language: go
 go:
 - 1.x
-- "1.21"
+- "1.22"
 
 services:
 - docker
diff --git a/examples/nginx/go.mod b/examples/nginx/go.mod
index 4a5021f85f..a6f67e793c 100644
--- a/examples/nginx/go.mod
+++ b/examples/nginx/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/examples/nginx
 
-go 1.21
+go 1.22
 
 require github.com/testcontainers/testcontainers-go v0.33.0
 
diff --git a/examples/toxiproxy/go.mod b/examples/toxiproxy/go.mod
index 165f9875ce..04be7036c1 100644
--- a/examples/toxiproxy/go.mod
+++ b/examples/toxiproxy/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/examples/toxiproxy
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Shopify/toxiproxy/v2 v2.8.0
diff --git a/go.mod b/go.mod
index fd6a023cb8..678d37ec08 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go
 
-go 1.21
+go 1.22
 
 require (
 	dario.cat/mergo v1.0.0
diff --git a/modulegen/_template/ci.yml.tmpl b/modulegen/_template/ci.yml.tmpl
index 616dd2bee6..4b15371337 100644
--- a/modulegen/_template/ci.yml.tmpl
+++ b/modulegen/_template/ci.yml.tmpl
@@ -26,7 +26,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.21.x, 1.x]
+        go-version: [1.22.x, 1.x]
         platform: [ubuntu-latest, macos-latest]
     uses: ./.github/workflows/ci-test-go.yml
     with:
@@ -44,7 +44,7 @@ jobs:
     name: "Test with reaper off"
     strategy:
       matrix:
-        go-version: [1.21.x, 1.x]
+        go-version: [1.22.x, 1.x]
     uses: ./.github/workflows/ci-test-go.yml
     with:
       go-version: {{ "${{ matrix.go-version }}" }}
@@ -61,7 +61,7 @@ jobs:
     name: "Test with Rootless Docker"
     strategy:
       matrix:
-        go-version: [1.21.x, 1.x]
+        go-version: [1.22.x, 1.x]
         platform: [ubuntu-latest]
     uses: ./.github/workflows/ci-test-go.yml
     with:
@@ -76,7 +76,7 @@ jobs:
   test-module-generator:
     strategy:
       matrix:
-        go-version: [1.21.x, 1.x]
+        go-version: [1.22.x, 1.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     uses: ./.github/workflows/ci-test-go.yml
     with:
@@ -92,7 +92,7 @@ jobs:
     needs: test
     strategy:
       matrix:
-        go-version: [1.21.x, 1.x]
+        go-version: [1.22.x, 1.x]
         platform: [ubuntu-latest]
         module: [{{ .Modules }}]
     uses: ./.github/workflows/ci-test-go.yml
@@ -112,7 +112,7 @@ jobs:
         module: [{{ .Examples }}]
     uses: ./.github/workflows/ci-test-go.yml
     with:
-      go-version: "1.21.x"
+      go-version: "1.22.x"
       fail-fast: true
       platform: 'ubuntu-latest'
       project-directory: {{ "examples/${{ matrix.module }}" }}
diff --git a/modulegen/go.mod b/modulegen/go.mod
index 613a7c2791..0e66fb16d7 100644
--- a/modulegen/go.mod
+++ b/modulegen/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modulegen
 
-go 1.21
+go 1.22
 
 require (
 	github.com/spf13/cobra v1.8.0
diff --git a/modules/artemis/go.mod b/modules/artemis/go.mod
index 43aebbeaa8..adb9dddf08 100644
--- a/modules/artemis/go.mod
+++ b/modules/artemis/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/artemis
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/go-connections v0.5.0
diff --git a/modules/azurite/go.mod b/modules/azurite/go.mod
index 63acddbb1b..826a457a9a 100644
--- a/modules/azurite/go.mod
+++ b/modules/azurite/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/azurite
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
diff --git a/modules/cassandra/go.mod b/modules/cassandra/go.mod
index ded3d59600..fce3c2d919 100644
--- a/modules/cassandra/go.mod
+++ b/modules/cassandra/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/cassandra
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/go-connections v0.5.0
diff --git a/modules/chroma/go.mod b/modules/chroma/go.mod
index ad2d9ed98b..2c03baa164 100644
--- a/modules/chroma/go.mod
+++ b/modules/chroma/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/chroma
 
-go 1.21
+go 1.22
 
 require (
 	github.com/amikos-tech/chroma-go v0.1.2
diff --git a/modules/clickhouse/go.mod b/modules/clickhouse/go.mod
index 1008f9332f..5542929f72 100644
--- a/modules/clickhouse/go.mod
+++ b/modules/clickhouse/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/clickhouse
 
-go 1.21
+go 1.22
 
 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.20.0
diff --git a/modules/cockroachdb/go.mod b/modules/cockroachdb/go.mod
index fd02aa4d62..d31c6f54ec 100644
--- a/modules/cockroachdb/go.mod
+++ b/modules/cockroachdb/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/cockroachdb
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/go-connections v0.5.0
diff --git a/modules/compose/go.mod b/modules/compose/go.mod
index f0cfa98c94..487bdcb7d0 100644
--- a/modules/compose/go.mod
+++ b/modules/compose/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/compose
 
-go 1.21
+go 1.22
 
 replace github.com/testcontainers/testcontainers-go => ../..
 
diff --git a/modules/consul/go.mod b/modules/consul/go.mod
index c81bd4d53a..079447aa27 100644
--- a/modules/consul/go.mod
+++ b/modules/consul/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/consul
 
-go 1.21
+go 1.22
 
 require (
 	github.com/hashicorp/consul/api v1.27.0
diff --git a/modules/couchbase/go.mod b/modules/couchbase/go.mod
index 517ce1a474..96365d44e7 100644
--- a/modules/couchbase/go.mod
+++ b/modules/couchbase/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/couchbase
 
-go 1.21
+go 1.22
 
 toolchain go1.21.7
 
diff --git a/modules/dolt/go.mod b/modules/dolt/go.mod
index 201a222475..804efb8483 100644
--- a/modules/dolt/go.mod
+++ b/modules/dolt/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/dolt
 
-go 1.21
+go 1.22
 
 require (
 	github.com/go-sql-driver/mysql v1.7.1
diff --git a/modules/elasticsearch/go.mod b/modules/elasticsearch/go.mod
index 2d5f1adb31..a766e55dd0 100644
--- a/modules/elasticsearch/go.mod
+++ b/modules/elasticsearch/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/elasticsearch
 
-go 1.21
+go 1.22
 
 require (
 	github.com/elastic/go-elasticsearch/v8 v8.12.1
diff --git a/modules/gcloud/go.mod b/modules/gcloud/go.mod
index 36a70a1269..00a723f58c 100644
--- a/modules/gcloud/go.mod
+++ b/modules/gcloud/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/gcloud
 
-go 1.21
+go 1.22
 
 require (
 	cloud.google.com/go/bigquery v1.59.1
diff --git a/modules/grafana-lgtm/go.mod b/modules/grafana-lgtm/go.mod
index a9c73fcafe..73a94c714b 100644
--- a/modules/grafana-lgtm/go.mod
+++ b/modules/grafana-lgtm/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/grafanalgtm
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/go-connections v0.5.0
diff --git a/modules/inbucket/go.mod b/modules/inbucket/go.mod
index 1188b1efc5..18939bc445 100644
--- a/modules/inbucket/go.mod
+++ b/modules/inbucket/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/inbucket
 
-go 1.21
+go 1.22
 
 require (
 	github.com/inbucket/inbucket v2.0.0+incompatible
diff --git a/modules/influxdb/go.mod b/modules/influxdb/go.mod
index 749ba62026..f11c1de449 100644
--- a/modules/influxdb/go.mod
+++ b/modules/influxdb/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/influxdb
 
-go 1.21
+go 1.22
 
 require (
 	github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c
diff --git a/modules/k3s/go.mod b/modules/k3s/go.mod
index fd69916dc6..da3a23fd92 100644
--- a/modules/k3s/go.mod
+++ b/modules/k3s/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/k3s
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/docker v27.1.1+incompatible
diff --git a/modules/k6/go.mod b/modules/k6/go.mod
index 159a74c48c..58f96d04aa 100644
--- a/modules/k6/go.mod
+++ b/modules/k6/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/k6
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/docker v27.1.1+incompatible
diff --git a/modules/kafka/go.mod b/modules/kafka/go.mod
index a33d25d6c8..1148bd00f8 100644
--- a/modules/kafka/go.mod
+++ b/modules/kafka/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/kafka
 
-go 1.21
+go 1.22
 
 require (
 	github.com/IBM/sarama v1.42.1
diff --git a/modules/localstack/go.mod b/modules/localstack/go.mod
index 38c2f059e5..0bd92d1a01 100644
--- a/modules/localstack/go.mod
+++ b/modules/localstack/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/localstack
 
-go 1.21
+go 1.22
 
 require (
 	github.com/aws/aws-sdk-go v1.50.31
diff --git a/modules/mariadb/go.mod b/modules/mariadb/go.mod
index 2c0119f1b7..e8039caf58 100644
--- a/modules/mariadb/go.mod
+++ b/modules/mariadb/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/mariadb
 
-go 1.21
+go 1.22
 
 require (
 	github.com/go-sql-driver/mysql v1.7.1
diff --git a/modules/milvus/go.mod b/modules/milvus/go.mod
index 5de6a6c7eb..fa6fa4524d 100644
--- a/modules/milvus/go.mod
+++ b/modules/milvus/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/milvus
 
-go 1.21
+go 1.22
 
 require (
 	github.com/milvus-io/milvus-sdk-go/v2 v2.3.6
diff --git a/modules/minio/go.mod b/modules/minio/go.mod
index a15b25688c..c50c958c21 100644
--- a/modules/minio/go.mod
+++ b/modules/minio/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/minio
 
-go 1.21
+go 1.22
 
 require (
 	github.com/minio/minio-go/v7 v7.0.68
diff --git a/modules/mockserver/go.mod b/modules/mockserver/go.mod
index 81cb5a9d0c..e2ba76d72d 100644
--- a/modules/mockserver/go.mod
+++ b/modules/mockserver/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/mockserver
 
-go 1.21
+go 1.22
 
 require (
 	github.com/BraspagDevelopers/mock-server-client v0.2.2
diff --git a/modules/mongodb/go.mod b/modules/mongodb/go.mod
index 9756c3f722..e7e8c724bc 100644
--- a/modules/mongodb/go.mod
+++ b/modules/mongodb/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/mongodb
 
-go 1.21
+go 1.22
 
 require (
 	github.com/testcontainers/testcontainers-go v0.33.0
diff --git a/modules/mssql/go.mod b/modules/mssql/go.mod
index 5b36d98189..83411fb7aa 100644
--- a/modules/mssql/go.mod
+++ b/modules/mssql/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/mssql
 
-go 1.21
+go 1.22
 
 require (
 	github.com/microsoft/go-mssqldb v1.7.0
diff --git a/modules/mysql/go.mod b/modules/mysql/go.mod
index 1366d35491..f3f00dcb8b 100644
--- a/modules/mysql/go.mod
+++ b/modules/mysql/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/mysql
 
-go 1.21
+go 1.22
 
 require (
 	github.com/go-sql-driver/mysql v1.7.1
diff --git a/modules/nats/go.mod b/modules/nats/go.mod
index 4163f8ba83..0a4863c41e 100644
--- a/modules/nats/go.mod
+++ b/modules/nats/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/nats
 
-go 1.21
+go 1.22
 
 require (
 	github.com/nats-io/nats.go v1.33.1
diff --git a/modules/neo4j/go.mod b/modules/neo4j/go.mod
index e63e2854a3..13f310eeb5 100644
--- a/modules/neo4j/go.mod
+++ b/modules/neo4j/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/neo4j
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/go-connections v0.5.0
diff --git a/modules/ollama/go.mod b/modules/ollama/go.mod
index 8dc279da02..5e586e858e 100644
--- a/modules/ollama/go.mod
+++ b/modules/ollama/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/ollama
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/docker v27.1.1+incompatible
diff --git a/modules/openfga/go.mod b/modules/openfga/go.mod
index 6aa77ede7c..388b9c040c 100644
--- a/modules/openfga/go.mod
+++ b/modules/openfga/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/openfga
 
-go 1.21
+go 1.22
 
 require (
 	github.com/openfga/go-sdk v0.3.5
diff --git a/modules/openldap/go.mod b/modules/openldap/go.mod
index e6477cb0a6..2f13ed78cc 100644
--- a/modules/openldap/go.mod
+++ b/modules/openldap/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/openldap
 
-go 1.21
+go 1.22
 
 require (
 	github.com/go-ldap/ldap/v3 v3.4.6
diff --git a/modules/opensearch/go.mod b/modules/opensearch/go.mod
index 721eb1f292..50146f5964 100644
--- a/modules/opensearch/go.mod
+++ b/modules/opensearch/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/opensearch
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/docker v27.1.1+incompatible
diff --git a/modules/postgres/go.mod b/modules/postgres/go.mod
index 45d18c23f0..4b57997260 100644
--- a/modules/postgres/go.mod
+++ b/modules/postgres/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/postgres
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/go-connections v0.5.0
diff --git a/modules/pulsar/go.mod b/modules/pulsar/go.mod
index 19b896c1da..b9e77f4d58 100644
--- a/modules/pulsar/go.mod
+++ b/modules/pulsar/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/pulsar
 
-go 1.21
+go 1.22
 
 require (
 	github.com/apache/pulsar-client-go v0.10.0
diff --git a/modules/qdrant/go.mod b/modules/qdrant/go.mod
index e9e031e284..85db7229b3 100644
--- a/modules/qdrant/go.mod
+++ b/modules/qdrant/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/qdrant
 
-go 1.21
+go 1.22
 
 require (
 	github.com/qdrant/go-client v1.7.0
diff --git a/modules/rabbitmq/go.mod b/modules/rabbitmq/go.mod
index d7906746d0..e9d4a267fa 100644
--- a/modules/rabbitmq/go.mod
+++ b/modules/rabbitmq/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/rabbitmq
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/go-connections v0.5.0
diff --git a/modules/redis/go.mod b/modules/redis/go.mod
index db7d207002..e76c925c7e 100644
--- a/modules/redis/go.mod
+++ b/modules/redis/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/redis
 
-go 1.21
+go 1.22
 
 require (
 	github.com/go-redis/redis/v8 v8.11.5
diff --git a/modules/redpanda/go.mod b/modules/redpanda/go.mod
index 8a780fca54..4ce12872ee 100644
--- a/modules/redpanda/go.mod
+++ b/modules/redpanda/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/redpanda
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/go-connections v0.5.0
diff --git a/modules/registry/go.mod b/modules/registry/go.mod
index b1d844515d..36e95dfdf0 100644
--- a/modules/registry/go.mod
+++ b/modules/registry/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/registry
 
-go 1.21
+go 1.22
 
 require (
 	github.com/cpuguy83/dockercfg v0.3.1
diff --git a/modules/surrealdb/go.mod b/modules/surrealdb/go.mod
index 80db8eccc6..d3d2d049d6 100644
--- a/modules/surrealdb/go.mod
+++ b/modules/surrealdb/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/surrealdb
 
-go 1.21
+go 1.22
 
 require (
 	github.com/surrealdb/surrealdb.go v0.2.1
diff --git a/modules/valkey/go.mod b/modules/valkey/go.mod
index 220069fea0..0c1173f987 100644
--- a/modules/valkey/go.mod
+++ b/modules/valkey/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/valkey
 
-go 1.21
+go 1.22
 
 require (
 	github.com/google/uuid v1.6.0
diff --git a/modules/vault/go.mod b/modules/vault/go.mod
index 5cdd22209a..064a23bcce 100644
--- a/modules/vault/go.mod
+++ b/modules/vault/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/vault
 
-go 1.21
+go 1.22
 
 require (
 	github.com/docker/docker v27.1.1+incompatible
diff --git a/modules/weaviate/go.mod b/modules/weaviate/go.mod
index d08dfc8ba2..6572fb3607 100644
--- a/modules/weaviate/go.mod
+++ b/modules/weaviate/go.mod
@@ -1,6 +1,6 @@
 module github.com/testcontainers/testcontainers-go/modules/weaviate
 
-go 1.21
+go 1.22
 
 require (
 	github.com/testcontainers/testcontainers-go v0.33.0
diff --git a/scripts/bump-go.sh b/scripts/bump-go.sh
index 7b949ee89b..5ff33a5e6e 100755
--- a/scripts/bump-go.sh
+++ b/scripts/bump-go.sh
@@ -21,7 +21,7 @@ readonly CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 readonly DRY_RUN="${DRY_RUN:-true}"
 readonly ROOT_DIR="$(dirname "$CURRENT_DIR")"
 readonly GO_MOD_FILE="${ROOT_DIR}/go.mod"
-readonly DEVCONTAINER_IMAGE_PREFIX="go:0-"
+readonly DEVCONTAINER_IMAGE_PREFIX="go:"
 
 function main() {
   echo "Updating Go version:"
diff --git a/wait/testdata/go.mod b/wait/testdata/go.mod
index 0b51175838..ab1b280416 100644
--- a/wait/testdata/go.mod
+++ b/wait/testdata/go.mod
@@ -1,3 +1,3 @@
 module httptest
 
-go 1.21
+go 1.22

From 5245aa853b91455d9f20cbdcd5d259a28d700aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Tue, 27 Aug 2024 10:33:39 +0200
Subject: [PATCH 3/3] chore: use new testcontainers/ryuk:0.9.0 image (#2750)

---
 internal/config/config.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/config/config.go b/internal/config/config.go
index f1d702ec36..a172fa3a16 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -11,7 +11,7 @@ import (
 	"github.com/magiconair/properties"
 )
 
-const ReaperDefaultImage = "testcontainers/ryuk:0.8.1"
+const ReaperDefaultImage = "testcontainers/ryuk:0.9.0"
 
 var (
 	tcConfig     Config