Merge branch 'main' into docker-socket-info

* main: chore: use new testcontainers/ryuk:0.9.0 image (testcontainers#2750) chore(deps): bump minimal Go version from 1.21 to 1.22 (testcontainers#2743) chore(deps): bump github/codeql-action from 3.24.9 to 3.25.15 (testcontainers#2677)
mdelapenya · Aug 27, 2024 · 320ac54 · 320ac54
2 parents 8dd2979 + 5245aa8
commit 320ac54
Show file tree

Hide file tree

Showing 61 changed files with 74 additions and 74 deletions.
diff --git 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
@@ -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/.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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ is the minimal required config. @@
     language: go
     go:
     - 1.x
-    - "1.21"
+    - "1.22"
     services:
     - docker
@@ Expand Down @@