Skip to content

Commit

Permalink
GEOMESA-3316: Tests fail on OS X with Docker Desktop (#3015)
Browse files Browse the repository at this point in the history
* Bumping testcontainers version
* Adding doc for non-default Docker Desktop config on OS X
  • Loading branch information
jrs53 authored Dec 6, 2023
1 parent 9a4fb82 commit fa57984
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 4 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,3 +222,11 @@ environment variable to point to the root of your JDK. Example from a Mac:
To build for a different Scala version (e.g. 2.13), run the following script, then build as normal:

./build/change-scala-version.sh 2.13

### Building on OS X

When building on OS X and using Docker Desktop in a non-default configuration, you may need to edit `~/.testcontainers.properties` to contain the following:

```
docker.client.strategy=org.testcontainers.dockerclient.UnixSocketClientProviderStrategy
```
8 changes: 8 additions & 0 deletions build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,3 +222,11 @@ environment variable to point to the root of your JDK. Example from a Mac:
To build for a different Scala version (e.g. 2.13), run the following script, then build as normal:

./build/change-scala-version.sh 2.13

### Building on OS X

When building on OS X and using Docker Desktop in a non-default configuration, you may need to edit `~/.testcontainers.properties` to contain the following:

```
docker.client.strategy=org.testcontainers.dockerclient.UnixSocketClientProviderStrategy
```
14 changes: 11 additions & 3 deletions build/cqs.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@ io.opentelemetry:opentelemetry-context 1.15.0 compile
io.opentelemetry:opentelemetry-context 1.25.0 compile
io.opentelemetry:opentelemetry-semconv 1.15.0-alpha compile
io.opentelemetry:opentelemetry-semconv 1.25.0-alpha compile
io.prometheus:simpleclient 0.16.0 compile
io.prometheus:simpleclient_common 0.16.0 compile
io.prometheus:simpleclient_dropwizard 0.16.0 compile
io.prometheus:simpleclient_httpserver 0.16.0 compile
io.prometheus:simpleclient_pushgateway 0.16.0 compile
io.prometheus:simpleclient_tracer_common 0.16.0 compile
io.prometheus:simpleclient_tracer_otel 0.16.0 compile
io.prometheus:simpleclient_tracer_otel_agent 0.16.0 compile
io.sgr:s2-geometry-library-java 1.0.1 compile
it.geosolutions.jaiext.affine:jt-affine 1.1.24 compile
it.geosolutions.jaiext.algebra:jt-algebra 1.1.24 compile
Expand Down Expand Up @@ -372,7 +380,7 @@ org.slf4j:jul-to-slf4j 1.7.36 test
org.specs2:specs2-core_2.12 4.9.2 test
org.specs2:specs2-junit_2.12 4.9.2 test
org.specs2:specs2-mock_2.12 4.9.2 test
org.testcontainers:kafka 1.17.6 test
org.testcontainers:postgresql 1.17.6 test
org.testcontainers:testcontainers 1.17.6 test
org.testcontainers:kafka 1.19.3 test
org.testcontainers:postgresql 1.19.3 test
org.testcontainers:testcontainers 1.19.3 test
org.wololo:jts2geojson 0.16.1 test
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@

<specs2.version>4.9.2</specs2.version>
<junit.version>4.13.1</junit.version>
<testcontainers.version>1.17.6</testcontainers.version>
<testcontainers.version>1.19.3</testcontainers.version>

<!-- *** provided artifacts, not bundled to support multiple environments *** -->

Expand Down

0 comments on commit fa57984

Please sign in to comment.