Skip to content

Commit 320ac54

Browse files
mdelapenyamdelapenya
committed
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)
2 parents 8dd2979 + 5245aa8 commit 320ac54

File tree

61 files changed

+74
-74
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+74
-74
lines changed

‎.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// README at: https://github.com/devcontainers/templates/tree/main/src/go
33
{
44
"name": "Go",
5-
"image": "mcr.microsoft.com/devcontainers/go:1.21-bookworm",
5+
"image": "mcr.microsoft.com/devcontainers/go:1.22-bookworm",
66

77
// Features to add to the dev container. More info: https://containers.dev/features.
88
// "features": {},

‎.github/workflows/ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
test:
2727
strategy:
2828
matrix:
29-
go-version: [1.21.x, 1.x]
29+
go-version: [1.22.x, 1.x]
3030
platform: [ubuntu-latest, macos-latest]
3131
uses: ./.github/workflows/ci-test-go.yml
3232
with:
@@ -44,7 +44,7 @@ jobs:
4444
name: "Test with reaper off"
4545
strategy:
4646
matrix:
47-
go-version: [1.21.x, 1.x]
47+
go-version: [1.22.x, 1.x]
4848
uses: ./.github/workflows/ci-test-go.yml
4949
with:
5050
go-version: ${{ matrix.go-version }}
@@ -61,7 +61,7 @@ jobs:
6161
name: "Test with Rootless Docker"
6262
strategy:
6363
matrix:
64-
go-version: [1.21.x, 1.x]
64+
go-version: [1.22.x, 1.x]
6565
platform: [ubuntu-latest]
6666
uses: ./.github/workflows/ci-test-go.yml
6767
with:
@@ -76,7 +76,7 @@ jobs:
7676
test-module-generator:
7777
strategy:
7878
matrix:
79-
go-version: [1.21.x, 1.x]
79+
go-version: [1.22.x, 1.x]
8080
platform: [ubuntu-latest, macos-latest, windows-latest]
8181
uses: ./.github/workflows/ci-test-go.yml
8282
with:
@@ -92,7 +92,7 @@ jobs:
9292
needs: test
9393
strategy:
9494
matrix:
95-
go-version: [1.21.x, 1.x]
95+
go-version: [1.22.x, 1.x]
9696
platform: [ubuntu-latest]
9797
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]
9898
uses: ./.github/workflows/ci-test-go.yml
@@ -112,7 +112,7 @@ jobs:
112112
module: [nginx, toxiproxy]
113113
uses: ./.github/workflows/ci-test-go.yml
114114
with:
115-
go-version: "1.21.x"
115+
go-version: "1.22.x"
116116
fail-fast: true
117117
platform: 'ubuntu-latest'
118118
project-directory: examples/${{ matrix.module }}

‎.github/workflows/codeql.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353

5454
# Initializes the CodeQL tools for scanning.
5555
- name: Initialize CodeQL
56-
uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
56+
uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
5757
with:
5858
languages: ${{ matrix.language }}
5959
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -67,7 +67,7 @@ jobs:
6767
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6868
# If this step fails, then you should remove it and run the build manually (see below)
6969
- name: Autobuild
70-
uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
70+
uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
7171

7272
# ℹ️ Command-line programs to run using the OS shell.
7373
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -80,6 +80,6 @@ jobs:
8080
# ./location_of_script_within_repo/buildscript.sh
8181

8282
- name: Perform CodeQL Analysis
83-
uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
83+
uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
8484
with:
8585
category: "/language:${{matrix.language}}"

‎.github/workflows/scorecards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ jobs:
5151

5252
# required for Code scanning alerts
5353
- name: "Upload SARIF results to code scanning"
54-
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
54+
uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
5555
with:
5656
sarif_file: results.sarif

‎docs/system_requirements/ci/aws_codebuild.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ version: 0.2
1111
phases:
1212
install:
1313
runtime-versions:
14-
golang: 1.21
14+
golang: 1.22
1515
build:
1616
commands:
1717
- go test ./...

‎docs/system_requirements/ci/concourse_ci.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
start_docker
3737
3838
cd repo
39-
docker run -it --rm -v "$PWD:$PWD" -w "$PWD" -v /var/run/docker.sock:/var/run/docker.sock golang:1.21 go test ./...
39+
docker run -it --rm -v "$PWD:$PWD" -w "$PWD" -v /var/run/docker.sock:/var/run/docker.sock golang:1.22 go test ./...
4040
```
4141
4242
Finally, you can use Concourse's [fly CLI](https://concourse-ci.org/fly.html) to set the pipeline and trigger the job:

‎docs/system_requirements/ci/dind_patterns.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $ tree .
2424
└── platform
2525
└── integration_test.go
2626

27-
$ docker run -it --rm -v $PWD:$PWD -w $PWD -v /var/run/docker.sock:/var/run/docker.sock golang:1.21 go test ./... -v
27+
$ docker run -it --rm -v $PWD:$PWD -w $PWD -v /var/run/docker.sock:/var/run/docker.sock golang:1.22 go test ./... -v
2828
```
2929

3030
Where:
@@ -45,7 +45,7 @@ The same can be achieved with Docker Compose:
4545

4646
```yaml
4747
tests:
48-
image: golang:1.21
48+
image: golang:1.22
4949
stop_signal: SIGKILL
5050
stdin_open: true
5151
tty: true

‎docs/system_requirements/ci/gitlab_ci.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ variables:
5757
DOCKER_DRIVER: overlay2
5858
5959
test:
60-
image: golang:1.21
60+
image: golang:1.22
6161
stage: test
6262
script: go test ./... -v
6363
```

‎docs/system_requirements/ci/tekton.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
- name: source
1717
steps:
1818
- name: read
19-
image: golang:1.21
19+
image: golang:1.22
2020
workingDir: $(workspaces.source.path)
2121
script: go test ./... -v
2222
volumeMounts:

‎docs/system_requirements/ci/travis.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ is the minimal required config.
77
language: go
88
go:
99
- 1.x
10-
- "1.21"
10+
- "1.22"
1111

1212
services:
1313
- docker

‎examples/nginx/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/examples/nginx
22

3-
go 1.21
3+
go 1.22
44

55
require github.com/testcontainers/testcontainers-go v0.33.0
66

‎examples/toxiproxy/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/examples/toxiproxy
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/Shopify/toxiproxy/v2 v2.8.0

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
dario.cat/mergo v1.0.0

‎internal/config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/magiconair/properties"
1212
)
1313

14-
const ReaperDefaultImage = "testcontainers/ryuk:0.8.1"
14+
const ReaperDefaultImage = "testcontainers/ryuk:0.9.0"
1515

1616
var (
1717
tcConfig Config

‎modulegen/_template/ci.yml.tmpl

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
test:
2727
strategy:
2828
matrix:
29-
go-version: [1.21.x, 1.x]
29+
go-version: [1.22.x, 1.x]
3030
platform: [ubuntu-latest, macos-latest]
3131
uses: ./.github/workflows/ci-test-go.yml
3232
with:
@@ -44,7 +44,7 @@ jobs:
4444
name: "Test with reaper off"
4545
strategy:
4646
matrix:
47-
go-version: [1.21.x, 1.x]
47+
go-version: [1.22.x, 1.x]
4848
uses: ./.github/workflows/ci-test-go.yml
4949
with:
5050
go-version: {{ "${{ matrix.go-version }}" }}
@@ -61,7 +61,7 @@ jobs:
6161
name: "Test with Rootless Docker"
6262
strategy:
6363
matrix:
64-
go-version: [1.21.x, 1.x]
64+
go-version: [1.22.x, 1.x]
6565
platform: [ubuntu-latest]
6666
uses: ./.github/workflows/ci-test-go.yml
6767
with:
@@ -76,7 +76,7 @@ jobs:
7676
test-module-generator:
7777
strategy:
7878
matrix:
79-
go-version: [1.21.x, 1.x]
79+
go-version: [1.22.x, 1.x]
8080
platform: [ubuntu-latest, macos-latest, windows-latest]
8181
uses: ./.github/workflows/ci-test-go.yml
8282
with:
@@ -92,7 +92,7 @@ jobs:
9292
needs: test
9393
strategy:
9494
matrix:
95-
go-version: [1.21.x, 1.x]
95+
go-version: [1.22.x, 1.x]
9696
platform: [ubuntu-latest]
9797
module: [{{ .Modules }}]
9898
uses: ./.github/workflows/ci-test-go.yml
@@ -112,7 +112,7 @@ jobs:
112112
module: [{{ .Examples }}]
113113
uses: ./.github/workflows/ci-test-go.yml
114114
with:
115-
go-version: "1.21.x"
115+
go-version: "1.22.x"
116116
fail-fast: true
117117
platform: 'ubuntu-latest'
118118
project-directory: {{ "examples/${{ matrix.module }}" }}

‎modulegen/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modulegen
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/spf13/cobra v1.8.0

‎modules/artemis/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/artemis
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/docker/go-connections v0.5.0

‎modules/azurite/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/azurite
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1

‎modules/cassandra/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/cassandra
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/docker/go-connections v0.5.0

‎modules/chroma/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/chroma
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/amikos-tech/chroma-go v0.1.2

‎modules/clickhouse/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/clickhouse
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/ClickHouse/clickhouse-go/v2 v2.20.0

‎modules/cockroachdb/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/cockroachdb
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/docker/go-connections v0.5.0

‎modules/compose/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/compose
22

3-
go 1.21
3+
go 1.22
44

55
replace github.com/testcontainers/testcontainers-go => ../..
66

‎modules/consul/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/consul
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/hashicorp/consul/api v1.27.0

‎modules/couchbase/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/couchbase
22

3-
go 1.21
3+
go 1.22
44

55
toolchain go1.21.7
66

‎modules/dolt/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/dolt
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/go-sql-driver/mysql v1.7.1

‎modules/elasticsearch/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/elasticsearch
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/elastic/go-elasticsearch/v8 v8.12.1

‎modules/gcloud/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/gcloud
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
cloud.google.com/go/bigquery v1.59.1

‎modules/grafana-lgtm/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/grafanalgtm
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/docker/go-connections v0.5.0

‎modules/inbucket/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/inbucket
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/inbucket/inbucket v2.0.0+incompatible

‎modules/influxdb/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/influxdb
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c

‎modules/k3s/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/k3s
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/docker/docker v27.1.1+incompatible

‎modules/k6/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/k6
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/docker/docker v27.1.1+incompatible

‎modules/kafka/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/testcontainers/testcontainers-go/modules/kafka
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/IBM/sarama v1.42.1

0 commit comments

Comments
 (0)