Merge branch 'develop' into sb-clickhouse

testcontainers · Jul 9, 2023 · 0a4eae7 · 0a4eae7
2 parents 6dafc8e + 655f4b2
commit 0a4eae7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -45,6 +45,10 @@ jobs:
  key: ${{ matrix.os }}-nuget-${{ hashFiles('Directory.Build.props') }}
  path: ~/.nuget/packages
 
+ - name: Free Disk Space
+ run: Remove-Item -Recurse -Force '/usr/local/lib/android' -ErrorAction SilentlyContinue # TODO: Split module tests across multiple runners (the Docker images require too much disk space)
+ shell: pwsh
+
  - name: Setup .NET
  uses: actions/setup-dotnet@v3
 
@@ -150,7 +154,7 @@ jobs:
  - name: Publish NuGet Package
  run: dotnet cake --target=Publish
 
- - uses: release-drafter/release-drafter@6df64e4ba4842c203c604c1f45246c5863410adb
+ - uses: release-drafter/release-drafter@65c5fb495d1e69aa8c08a3317bc44ff8aabe9772
  with:
  version: ${{ env.semVer }} # Cake sets the semVer environment variable
  env:

diff --git a/src/Testcontainers.Elasticsearch/ElasticsearchBuilder.cs b/src/Testcontainers.Elasticsearch/ElasticsearchBuilder.cs
@@ -72,6 +72,7 @@ protected override ElasticsearchBuilder Init()
  .WithUsername(DefaultUsername)
  .WithPassword(DefaultPassword)
  .WithEnvironment("discovery.type", "single-node")
+ .WithEnvironment("ingest.geoip.downloader.enabled", "false")
  .WithResourceMapping(DefaultMemoryVmOption, ElasticsearchDefaultMemoryVmOptionFilePath)
  .WithWaitStrategy(Wait.ForUnixContainer().AddCustomWaitStrategy(new WaitUntil()));
  }