chore: run tests on windows workers

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

.github/workflows/ci-test-go.yml

@@ -37,6 +37,9 @@ on:
         type: boolean
         default: false
         description: "Disable the ryuk container for the test."
+    secrets:
+      TC_CLOUD_TOKEN:
+        required: true
 
 permissions:
   contents: read
@@ -92,15 +95,18 @@ jobs:
         working-directory: ./${{ inputs.project-directory }}
         run: make tools-tidy
 
+      - name: Setup Testcontainers Cloud Client
+        # Use Testcontainers Cloud for Windows and MacOS, but only for merge commits on main
+        if: ${{ inputs.run-tests && (inputs.platform == 'windows-latest' || inputs.platform == 'macos-latest') }}
+        uses: atomicjar/testcontainers-cloud-setup-action@v1
+        with:
+          token: ${{ secrets.TC_CLOUD_TOKEN }}
+
       - name: ensure compilation
         working-directory: ./${{ inputs.project-directory }}
         run: go build
 
       - name: go test
-        # only run tests on linux, there are a number of things that won't allow the tests to run on anything else
-        # many (maybe, all?) images used can only be build on Linux, they don't have Windows in their manifest, and
-        # we can't put Windows Server in "Linux Mode" in Github actions
-        # another, host mode is only available on Linux, and we have tests around that, do we skip them?
         if: ${{ inputs.run-tests }}
         working-directory: ./${{ inputs.project-directory }}
         timeout-minutes: 30

.github/workflows/ci.yml

@@ -27,119 +27,14 @@ jobs:
     strategy:
       matrix:
         go-version: [1.21.x, 1.x]
-        platform: [ubuntu-latest, macos-latest]
+        platform: [windows-latest]
     uses: ./.github/workflows/ci-test-go.yml
+    secrets: inherit
     with:
       go-version: ${{ matrix.go-version }}
       fail-fast: true
       platform: ${{ matrix.platform }}
       project-directory: "."
       rootless-docker: false
-      run-tests: ${{ matrix.platform == 'ubuntu-latest' }}
+      run-tests: ${{ matrix.platform == 'windows-latest' }}
       ryuk-disabled: false
-
-  # The job below is a copy of the job above, but with ryuk disabled.
-  # It's executed in the first stage to avoid concurrency issues.
-  test-reaper-off:
-    name: "Test with reaper off"
-    strategy:
-      matrix:
-        go-version: [1.21.x, 1.x]
-    uses: ./.github/workflows/ci-test-go.yml
-    with:
-      go-version: ${{ matrix.go-version }}
-      fail-fast: false
-      platform: "ubuntu-latest"
-      project-directory: "."
-      rootless-docker: false
-      run-tests: true
-      ryuk-disabled: true
-
-  # The job below is a copy of the job above, but with Docker rootless.
-  # It's executed in the first stage to avoid concurrency issues.
-  test-rootless-docker:
-    name: "Test with Rootless Docker"
-    strategy:
-      matrix:
-        go-version: [1.21.x, 1.x]
-        platform: [ubuntu-latest]
-    uses: ./.github/workflows/ci-test-go.yml
-    with:
-      go-version: ${{ matrix.go-version }}
-      fail-fast: false
-      platform: "ubuntu-latest"
-      project-directory: "."
-      rootless-docker: true
-      run-tests: true
-      ryuk-disabled: false
-
-  test-module-generator:
-    strategy:
-      matrix:
-        go-version: [1.21.x, 1.x]
-        platform: [ubuntu-latest, macos-latest, windows-latest]
-    uses: ./.github/workflows/ci-test-go.yml
-    with:
-      go-version: ${{ matrix.go-version }}
-      fail-fast: true
-      platform: ${{ matrix.platform }}
-      project-directory: "modulegen"
-      rootless-docker: false
-      run-tests: true
-      ryuk-disabled: false
-
-  test-modules:
-    needs: test
-    strategy:
-      matrix:
-        go-version: [1.21.x, 1.x]
-        platform: [ubuntu-latest]
-        module: [artemis, cassandra, chroma, clickhouse, cockroachdb, compose, consul, couchbase, elasticsearch, gcloud, 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, vault, weaviate]
-    uses: ./.github/workflows/ci-test-go.yml
-    with:
-      go-version: ${{ matrix.go-version }}
-      fail-fast: false
-      platform: ${{ matrix.platform }}
-      project-directory: modules/${{ matrix.module }}
-      rootless-docker: false
-      run-tests: ${{ matrix.platform == 'ubuntu-latest' }}
-      ryuk-disabled: false
-
-  test-examples:
-    needs: test-modules
-    strategy:
-      matrix:
-        module: [nginx, toxiproxy]
-    uses: ./.github/workflows/ci-test-go.yml
-    with:
-      go-version: "1.21.x"
-      fail-fast: true
-      platform: 'ubuntu-latest'
-      project-directory: examples/${{ matrix.module }}
-      rootless-docker: false
-      run-tests: true
-      ryuk-disabled: false
-
-  sonarcloud:
-    permissions:
-      contents: read  # for actions/checkout to fetch code
-      pull-requests: read  # for sonarsource/sonarcloud-github-action to determine which PR to decorate
-    if: ${{ github.ref_name == 'main' && github.repository_owner == 'testcontainers' }}
-    needs: test-examples
-    runs-on: ubuntu-latest 
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          # Disabling shallow clone is recommended for improving relevancy of reporting
-          fetch-depth: 0
-
-      - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: sonarcloud
-
-      - name: Analyze with SonarCloud
-        uses: sonarsource/sonarcloud-github-action@49e6cd3b187936a73b8280d59ffd9da69df63ec9 # v2.1.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

config_test.go

@@ -25,21 +25,13 @@ func TestReadConfig(t *testing.T) {
 	t.Run("Config is read just once", func(t *testing.T) {
 		t.Setenv("HOME", "")
 		t.Setenv("USERPROFILE", "") // Windows support
-		t.Setenv("TESTCONTAINERS_RYUK_DISABLED", "true")
-
-		cfg := testcontainers.ReadConfig()
-
-		expected := testcontainers.TestcontainersConfig{
-			RyukDisabled: true,
-			Config: config.Config{
-				RyukDisabled: true,
-			},
-		}
 
-		assert.Equal(t, expected, cfg)
+		t.Setenv("TESTCONTAINERS_RYUK_DISABLED", "true")
+		cfg1 := testcontainers.ReadConfig()
 
 		t.Setenv("TESTCONTAINERS_RYUK_DISABLED", "false")
-		cfg = testcontainers.ReadConfig()
-		assert.Equal(t, expected, cfg)
+		cfg2 := testcontainers.ReadConfig()
+
+		assert.Equal(t, cfg1, cfg2)
 	})
 }

docker_client_test.go

@@ -13,6 +13,10 @@ func TestGetDockerInfo(t *testing.T) {
 		ctx := context.Background()
 		c, err := NewDockerClientWithOpts(ctx)
 		require.NoError(t, err)
+		t.Cleanup(func() {
+			err := c.Close()
+			require.NoError(t, err)
+		})
 
 		info, err := c.Info(ctx)
 		require.NoError(t, err)
@@ -23,6 +27,10 @@ func TestGetDockerInfo(t *testing.T) {
 		ctx := context.Background()
 		c, err := NewDockerClientWithOpts(ctx)
 		require.NoError(t, err)
+		t.Cleanup(func() {
+			err := c.Close()
+			require.NoError(t, err)
+		})
 
 		count := 1024
 		wg := sync.WaitGroup{}

docker_files_test.go

@@ -2,6 +2,7 @@ package testcontainers_test
 
 import (
 	"context"
+	"io"
 	"os"
 	"path/filepath"
 	"testing"
@@ -30,7 +31,7 @@ func TestCopyFileToContainer(t *testing.T) {
 
 	container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{
-			Image: "docker.io/bash",
+			Image: "docker.io/bash:5.2.26",
 			Files: []testcontainers.ContainerFile{
 				{
 					Reader:            r,
@@ -51,8 +52,7 @@ func TestCopyFileToContainer(t *testing.T) {
 }
 
 func TestCopyFileToRunningContainer(t *testing.T) {
-	ctx, cnl := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cnl()
+	ctx := context.Background()
 
 	// Not using the assertations here to avoid leaking the library into the example
 	// copyFileAfterCreate {
@@ -83,6 +83,13 @@ func TestCopyFileToRunningContainer(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	r, err := container.Logs(ctx)
+	require.NoError(t, err)
+
+	bs, err := io.ReadAll(r)
+	require.NoError(t, err)
+	t.Log(">> container logs:", string(bs))
+
 	err = container.CopyFileToContainer(ctx, helloPath, "/scripts/hello.sh", 0o700)
 	// }
 
@@ -108,7 +115,7 @@ func TestCopyDirectoryToContainer(t *testing.T) {
 
 	container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{
-			Image: "docker.io/bash",
+			Image: "docker.io/bash:5.2.26",
 			Files: []testcontainers.ContainerFile{
 				{
 					HostFilePath: dataDirectory,
@@ -131,8 +138,7 @@ func TestCopyDirectoryToContainer(t *testing.T) {
 }
 
 func TestCopyDirectoryToRunningContainerAsFile(t *testing.T) {
-	ctx, cnl := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cnl()
+	ctx := context.Background()
 
 	// copyDirectoryToRunningContainerAsFile {
 	dataDirectory, err := filepath.Abs(filepath.Join(".", "testdata"))
@@ -146,7 +152,7 @@ func TestCopyDirectoryToRunningContainerAsFile(t *testing.T) {
 
 	container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{
-			Image: "docker.io/bash",
+			Image: "docker.io/bash:5.2.26",
 			Files: []testcontainers.ContainerFile{
 				{
 					HostFilePath:      waitForPath,
@@ -155,19 +161,27 @@ func TestCopyDirectoryToRunningContainerAsFile(t *testing.T) {
 				},
 			},
 			Cmd: []string{"bash", "/waitForHello.sh"},
+			LifecycleHooks: []testcontainers.ContainerLifecycleHooks{
+				{
+					PostReadies: []testcontainers.ContainerHook{
+						func(ctx context.Context, container testcontainers.Container) error {
+							// as the container is started, we can create the directory right after the container is ready
+							_, _, err = container.Exec(ctx, []string{"mkdir", "-p", "/scripts"})
+							if err != nil {
+								return err
+							}
+							return nil
+						},
+					},
+				},
+			},
 		},
 		Started: true,
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	// as the container is started, we can create the directory first
-	_, _, err = container.Exec(ctx, []string{"mkdir", "-p", "/scripts"})
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// because the container path is a directory, it will use the copy dir method as fallback
 	err = container.CopyFileToContainer(ctx, dataDirectory, "/scripts", 0o700)
 	if err != nil {
@@ -180,8 +194,7 @@ func TestCopyDirectoryToRunningContainerAsFile(t *testing.T) {
 }
 
 func TestCopyDirectoryToRunningContainerAsDir(t *testing.T) {
-	ctx, cnl := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cnl()
+	ctx := context.Background()
 
 	// Not using the assertations here to avoid leaking the library into the example
 	// copyDirectoryToRunningContainerAsDir {
@@ -196,7 +209,7 @@ func TestCopyDirectoryToRunningContainerAsDir(t *testing.T) {
 
 	container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{
-			Image: "docker.io/bash",
+			Image: "docker.io/bash:5.2.26",
 			Files: []testcontainers.ContainerFile{
 				{
 					HostFilePath:      waitForPath,
@@ -205,19 +218,27 @@ func TestCopyDirectoryToRunningContainerAsDir(t *testing.T) {
 				},
 			},
 			Cmd: []string{"bash", "/waitForHello.sh"},
+			LifecycleHooks: []testcontainers.ContainerLifecycleHooks{
+				{
+					PostReadies: []testcontainers.ContainerHook{
+						func(ctx context.Context, container testcontainers.Container) error {
+							// as the container is started, we can create the directory right after the container is ready
+							_, _, err = container.Exec(ctx, []string{"mkdir", "-p", "/scripts"})
+							if err != nil {
+								return err
+							}
+							return nil
+						},
+					},
+				},
+			},
 		},
 		Started: true,
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	// as the container is started, we can create the directory first
-	_, _, err = container.Exec(ctx, []string{"mkdir", "-p", "/scripts"})
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	err = container.CopyDirToContainer(ctx, dataDirectory, "/scripts", 0o700)
 	if err != nil {
 		t.Fatal(err)